Changeset 39457 for trunk/Ohana/src/opihi/cmd.astro/flux.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/cmd.astro/flux.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.astro/flux.c

@@ -1 +1 @@
 # include "astro.h"
+# include <signal.h>
 
 int flux (int argc, char **argv) {
   
   int i, j, k, xmin, ymin, xmax, ymax;
-  void *oldsignal;
   double ax, ay, s, S, flux;
   double bx[5], by[5], x[5], y[5], bb[5];
@@ -55 +55 @@
    we have to add up the angles for concave contours */
   flux = 0;
-  oldsignal = signal (SIGINT, handle_interrupt);
-  interrupt = FALSE;
+
+  struct sigaction *old_sigaction = SetInterrupt();
   for (j = ymin; (j < ymax) && !interrupt; j++) {
     V = (float *)(buf[0].matrix.buffer) + j*buf[0].matrix.Naxis[0] + xmin; 
@@ -72 +72 @@
     }
   }
-  signal (SIGINT, oldsignal);
+  ClearInterrupt (old_sigaction);
 
   gprint (GP_LOG, "flux: %f\n", flux);