Changeset 27096 for trunk/pswarp/src/pswarpArguments.c

Timestamp:

Feb 25, 2010, 4:26:50 PM (16 years ago)

Author:

Paul Price

Message:

Reworking error codes to get consistent exit codes.

File:

• trunk/pswarp/src/pswarpArguments.c (modified) (4 diffs)

trunk/pswarp/src/pswarpArguments.c

@@ -26 +26 @@
     // load config data from default locations
     pmConfig *config = pmConfigRead(&argc, argv, PSWARP_RECIPE);
-    if (config == NULL) {
-        psError(PSWARP_ERR_CONFIG, false, "Can't read site configuration");
+    if (!config) {
+        psError(psErrorCodeLast(), false, "Can't read configuration");
         return NULL;
     }
@@ -33 +33 @@
     // save the following additional recipe values based on command-line options
     // these options override the PSWARP recipe values loaded from recipe files
-    pmConfigRecipeOptions (config, PSWARP_RECIPE);
+    if (!pmConfigRecipeOptions(config, PSWARP_RECIPE)) {
+        psError(psErrorCodeLast(), false, "Can't do something with recipes");
+        psFree(config);
+        return NULL;
+    }
 
     pmConfigFileSetsMD(config->arguments, &argc, argv, "ASTROM",   "-astrom", "-astromlist");
@@ -72 +76 @@
         psThreadPoolInit (nThreads);
     }
-    pswarpSetThreads ();
+    pswarpSetThreads();
 
     if ((N = psArgumentGet(argc, argv, "-dumpconfig"))) {
@@ -160 +164 @@
     bool PSF = psMetadataLookupBool(&status, recipe, "PSF"); ///< Generate a PSF model?
     if (!status) {
-        PSF = true;
+        PSF = true;
         psWarning("PSF is not set in the %s recipe --- defaulting to TRUE.", PSWARP_RECIPE);
     }