Changeset 9574 for trunk/psastro/src/psastroParseCamera.c

Timestamp:

Oct 13, 2006, 5:10:34 PM (20 years ago)

Author:

eugene

Message:

all sorts of error handling fixes

File:

• trunk/psastro/src/psastroParseCamera.c (modified) (4 diffs)

trunk/psastro/src/psastroParseCamera.c

@@ -1 +1 @@
 # include "psastro.h"
-// XXX leak free 2006.04.27
 
 bool psastroParseCamera (pmConfig *config) {
@@ -8 +7 @@
     // the input image(s) are required arguments; they define the camera
     pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PSASTRO.INPUT", "INPUT");
-    if (!status) { psAbort (__func__, "missing INPUT entry"); }
+    if (!status) {
+        psError(PSASTRO_ERR_CONFIG, false, "Failed to build FPA from PSASTRO.INPUT");
+        return false;
+    }
 
     // select recipe options supplied on command line
@@ -30 +32 @@
             int chipNum = atoi(chips->data[i]);
             if (! pmFPASelectChip(input->fpa, chipNum, false)) {
-                psErrorStackPrint(stderr, "Chip number %d doesn't exist in camera.\n", chipNum);
-                exit(EXIT_FAILURE);
+                psError(PSASTRO_ERR_CONFIG, true, "Chip number %d doesn't exist in camera.\n", chipNum);
+                return false;
             }
         }
@@ -37 +39 @@
     psFree (chips);
 
-    psTrace(__func__, 1, "Done with psastroParseCamera...\n");
+    psTrace("psastro", 1, "Done with psastroParseCamera...\n");
     return true;
 }