Changeset 39419 for branches/eam_branches/ohana.20160226/src/opihi/dvo/avextract.c

Timestamp:

Mar 1, 2016, 11:34:48 AM (10 years ago)

Author:

eugene

Message:

list unused parameters; replace old signal code with SetInterrupt, ClearInterrupt; fix unsigned / signed int inconsistencies

File:

• branches/eam_branches/ohana.20160226/src/opihi/dvo/avextract.c (modified) (3 diffs)

branches/eam_branches/ohana.20160226/src/opihi/dvo/avextract.c

@@ -4 +4 @@
   
   off_t i, j, n, m;
-  int N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
+  int N, Npts, NPTS, last, next, state, Nfields, Nreturn, Nstack;
   int Nsecfilt, VERBOSE;
   char **cstack, name[1024];
+  unsigned int Ncstack;
 
   Catalog catalog;
@@ -169 +170 @@
 
   // grab data from all selected sky regions
-  void *Signal = signal (SIGINT, handle_interrupt);
-  interrupt = FALSE;
+  struct sigaction *old_sigaction = SetInterrupt();
   for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
 
@@ -254 +254 @@
     dvo_catalog_free (&catalog);
   }
-  signal (SIGINT, Signal);
-  interrupt = FALSE;
+  ClearInterrupt (old_sigaction);
+
   for (n = 0; n < Nreturn; n++) {
     ResetVector (vec[n], fields[n].type, Npts);