Changeset 11842

Timestamp:

Feb 15, 2007, 3:52:15 PM (19 years ago)

Author:

jhoblitt

Message:

handle p0toolConfig() errors properly

Location:

trunk/ippTools/src

Files:

• regtool.c (modified) (2 diffs)
• regtoolConfig.c (modified) (9 diffs)

trunk/ippTools/src/regtool.c

@@ -56 +56 @@
 int main(int argc, char **argv)
 {
-    psExit exit_status = PS_EXIT_SUCCESS;
-
     psLibInit(NULL);
 
     pxConfig *config = p0toolConfig(NULL, argc, argv);
+    if (!config) {
+        psError(PXTOOLS_ERR_CONFIG, false, "failed to configure");
+        goto FAIL;
+    }
 
     switch (config->mode) {
@@ -79 +81 @@
     psLibFinalize();
 
-    exit(exit_status);
+    exit(EXIT_SUCCESS);
 
 FAIL:
-    // use the top-most error to determine the exit status
-    exit_status = pxerrorGetExitStatus();
+    psErrorStackPrint(stderr, "\n");
+    int exit_status = pxerrorGetExitStatus();
 
     psFree(config);
     pmConfigDone();
-    psErrorStackPrint(stderr, "\n");
     psLibFinalize();
 

trunk/ippTools/src/regtoolConfig.c

@@ -28 +28 @@
 #include "p0tool.h"
 
-// this function can not fail -- exits on error
-pxConfig *p0toolConfig(pxConfig *config, int argc, char **argv) {
-
-    psExit exit_status = PS_EXIT_SUCCESS;
-
+pxConfig *p0toolConfig(pxConfig *config, int argc, char **argv)
+{
     if (!config) {
         config = pxConfigAlloc();
@@ -43 +40 @@
     if (!config->modules) {
         psError(PXTOOLS_ERR_CONFIG, false, "Can't find site configuration");
-        goto FAIL;
+        psFree(config);
+        return NULL;
     }
 
@@ -217 +215 @@
         if (config->mode) { \
             psError(PXTOOLS_ERR_CONFIG, true, "only one mode selection is allowed"); \
-            goto FAIL; \
+            psFree(config); \
+            return NULL; \
         } \
         config->mode = modeval; \
@@ -267 +266 @@
 
         psFree(argSets);
-        goto FAIL;
+        psFree(config);
+        return NULL;
     }
 
@@ -280 +280 @@
         if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\
             psError(PXTOOLS_ERR_PROG, false, "failed to add item " #name); \
-            goto FAIL; \
+            psFree(config); \
+            return NULL; \
         } \
     } \
@@ -296 +297 @@
             if (!psMetadataAddStr(config->where, PS_LIST_TAIL, "camera", 0, "==", str)) {
                 psError(PXTOOLS_ERR_PROG, false, "failed to add item camera");
-                goto FAIL;
+                psFree(config);
+                return NULL;
             }
         }
@@ -308 +310 @@
             if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "imfiles", 0, "==", imfiles)) {
                 psError(PXTOOLS_ERR_PROG, false, "failed to add item imfiles");
-                goto FAIL;
+                psFree(config);
+                return NULL;
             }
         }
@@ -326 +329 @@
     if (!config->dbh) {
         psError(PXTOOLS_ERR_SYS, false, "Can't configure database");
-        goto FAIL;
+        psFree(config);
+        return NULL;
     }
 
@@ -333 +337 @@
     config->argc = argc;
 
-
     return config;
-
-FAIL:
-    // use the top-most error to determine the exit status
-    exit_status = pxerrorGetExitStatus();
-
-    psFree(config);
-    pmConfigDone();
-    psLibFinalize();
-    exit(exit_status);
 }