Changeset 39457 for trunk/Ohana/src/opihi/dvo/mmextract.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/mmextract.c (modified) (4 diffs)

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

@@ -6 +6 @@
   off_t i, j, k, m;
   int n, N, Npts, NPTS, last, next, state;
-  int Nfields, Nreturn, Nreturn_base, Ncstack1, Ncstack2, Nstack1, Nstack2;
+  int Nfields, Nreturn, Nreturn_base, Nstack1, Nstack2;
   int Nwhere, Iwhere, Nmatch, Imatch, NTABLE, Nt1, Nt2, n1, n2;
   int Nsecfilt, VERBOSE, loadImages;
   char **cstack1, **cstack2, name1[1024], name2[1024];
   dbValue *values, **table1, **table2;
-  void *Signal;
 
   Catalog catalog;
@@ -102 +101 @@
 
   // parse the 'where' and 'matched to' segments of the line as boolean math expressions
+  unsigned int Ncstack1, Ncstack2;
   cstack1 = isolate_elements (Nwhere, &argv[Iwhere], &Ncstack1);
   cstack2 = isolate_elements (Nmatch, &argv[Imatch], &Ncstack2);
@@ -178 +178 @@
 
   // grab data from all selected sky regions
-  Signal = signal (SIGINT, handle_interrupt);
-  interrupt = FALSE;
+  struct sigaction *old_sigaction = SetInterrupt();
+
   for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
     /* lock, load, unlock catalog */
@@ -286 +286 @@
     // dbStackFreeReset ();
   }
-  signal (SIGINT, Signal);
-  interrupt = FALSE;
+  ClearInterrupt (old_sigaction);
 
   // free excess memory