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

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

@@ -4 +4 @@
   
   off_t i, j, Nimage;
-  int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
+  int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Nstack;
   char **cstack, name[1024];
-  void *Signal;
 
   Vector **vec;
@@ -57 +56 @@
 
   // parse the remainder of the line as a boolean math expression
+  unsigned int Ncstack;
   cstack = isolate_elements (argc-next, &argv[next], &Ncstack);
   
@@ -97 +97 @@
 
   // grab data from all selected sky regions
-  Signal = signal (SIGINT, handle_interrupt);
-  interrupt = FALSE;
+  struct sigaction *old_sigaction = SetInterrupt();
   for (j = 0; (j < Nimage) && !interrupt; j++) {
 
@@ -128 +127 @@
     }
   }
-  signal (SIGINT, Signal);
-  interrupt = FALSE;
+  ClearInterrupt (old_sigaction);
+
   for (n = 0; n < Nreturn; n++) {
     vec[n][0].Nelements = Npts;