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

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

@@ -27 +27 @@
   int N, done, Nfit;
   int status;
-  void *oldsignal;
   char name[64], line[1024], key[20];
   float *fitmags, *fiterrs, *wavecode, *vegaToAB;
@@ -48 +47 @@
   SEDtableRow sourceValue, sourceError;
   SEDfit minFit, testFit;
+  struct sigaction *old_sigaction = NULL;
 
   /* defaults */
@@ -74 +74 @@
   fiterrs = NULL;
   fitmags = NULL;
-
-  oldsignal = signal (SIGINT, handle_interrupt);
-  interrupt = FALSE;
 
   /* load photcode information */
@@ -184 +181 @@
   /* loop over regions, extract data for each region */
   // XXX add interrupt checks
+  old_sigaction = SetInterrupt();
   gprint (GP_ERR, "using "OFF_T_FMT" possible regions\n",  skylist[0].Nregions);
-  for (k = 0; k < skylist[0].Nregions; k++) {
+  for (k = 0; (k < skylist[0].Nregions) && !interrupt; k++) {
     /* lock, load, unlock catalog */
     dvo_catalog_init (&catalog, TRUE);
@@ -377 +375 @@
   if (sourceError.mags != NULL) free (sourceError.mags);
 
-  signal (SIGINT, oldsignal);
+  ClearInterrupt (old_sigaction);
   return (status);
 }