Changeset 39457 for trunk/Ohana/src/opihi/dvo/mextract.c

Timestamp:

Mar 11, 2016, 10:23:42 PM (10 years ago)

Author:

eugene

Message:

modify to pass with extremely pedantic build; force consistency for signed vs unsigned and int sizes; various relastro updates

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/dvo/mextract.c (modified) (4 diffs)

trunk/Ohana/src/opihi/dvo/mextract.c

@@ -25 +25 @@
   
   off_t i, j, k, m; // used for counter averages and measures
-  int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
+  int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Nstack;
   int Nsecfilt, VERBOSE, loadImages;
   char **cstack, name[1024];
   dbValue *values;
-  void *Signal;
 
   Catalog catalog;
@@ -115 +114 @@
 
   // parse the remainder of the line as a boolean math expression
+  unsigned int Ncstack;
   cstack = isolate_elements (argc-next, &argv[next], &Ncstack);
   
@@ -217 +217 @@
 
   // grab data from all selected sky regions
-  Signal = signal (SIGINT, handle_interrupt);
-  interrupt = FALSE;
-
-  // fprintf (stderr, "done setup...");
+  struct sigaction *old_sigaction = SetInterrupt();
 
   for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
@@ -310 +307 @@
     // dbStackFreeReset ();
   }
-  signal (SIGINT, Signal);
+  ClearInterrupt (old_sigaction);
   interrupt = FALSE;