Changeset 29754

Timestamp:

Nov 10, 2010, 5:38:10 PM (15 years ago)

Author:

heather

Message:

This fixes Shutdown related segfaults.

Location:

trunk/Ohana/src/relphot/src

Files:

• SetSignals.c (modified) (1 diff)
• load_catalogs.c (modified) (1 diff)

trunk/Ohana/src/relphot/src/SetSignals.c

@@ -15 +15 @@
       return;
     }
-    Shutdown ("halted by signal (trapped)");
+    Shutdown ("%s","halted by signal (trapped)");
 }    
 
 void SetProtect (int mode) {
   Protect = mode;
-  if (Trapped && !Protect) Shutdown ("halted by signal (protect)");
+  if (Trapped && !Protect) Shutdown ("%s","halted by signal (protect)");
 }
 

trunk/Ohana/src/relphot/src/load_catalogs.c

@@ -47 +47 @@
 
   fprintf (stderr, "using %d of %d stars (%d of %d measurements)\n", Nstar, Nstar_total, Nmeas, Nmeas_total);
-  if (Nstar < 1) {
-      Shutdown ("ERROR: no stars match the minimum requirements; exiting\n");
-  }
+  if (Nstar < 1) Shutdown ("%s", "ERROR: no stars match the minimum requirements; exiting \n");
+   
 
   // XXX consider only returning the populated catalogs