Changeset 7345

Timestamp:

Jun 5, 2006, 11:58:18 AM (20 years ago)

Author:

rhl

Message:

1/ Return error rather than exiting
2/ Check more error codes

File:

• trunk/psphot/src/psphotImageLoop.c (modified) (1 diff)

trunk/psphot/src/psphotImageLoop.c

@@ -11 +11 @@
     pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PSPHOT.INPUT");
     if (!status) {
-        psErrorStackPrint(stderr, "Can't find input data!\n");
-        exit(EXIT_FAILURE);
+        psError(PS_ERR_IO, false, "Can't find input data!");
+        return false;
     }
 
     pmFPAview *view = pmFPAviewAlloc (0);
-
+    
     // files associated with the science image
-    pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
-
+    if (!pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE)) {
+        psFree(view);
+        return false;
+    }
     while ((chip = pmFPAviewNextChip (view, input->fpa, 1)) != NULL) {
         psLogMsg ("psphot", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);