Changeset 11854

Timestamp:

Feb 16, 2007, 12:17:05 PM (19 years ago)

Author:

jhoblitt

Message:

properly handle pxinjectConfig() errors

Location:

trunk/ippTools/src

Files:

• pxinject.c (modified) (3 diffs)
• pxinjectConfig.c (modified) (11 diffs)

trunk/ippTools/src/pxinject.c

@@ -44 +44 @@
 
     pxConfig *config = pxinjectConfig(NULL, argc, argv);
+    if (!config) {
+        psError(PXTOOLS_ERR_CONFIG, false, "failed to configure");
+        goto FAIL;
+    }
 
     switch (config->mode) {
@@ -60 +64 @@
 FAIL:
     psErrorStackPrint (stderr, "failure\n");
+    int exit_status = pxerrorGetExitStatus();
 
     psFree(config);
@@ -65 +70 @@
     psLibFinalize();
 
-    exit(EXIT_FAILURE);
+    exit(exit_status);
 }
 

trunk/ippTools/src/pxinjectConfig.c

@@ -27 +27 @@
 #include "pxinject.h"
 
-// this function can not fail -- exits on error
-pxConfig *pxinjectConfig(pxConfig *config, int argc, char **argv) {
+pxConfig *pxinjectConfig(pxConfig *config, int argc, char **argv)
+{
     if (!config) {
         config = pxConfigAlloc();
@@ -39 +39 @@
     if (!config->modules) {
         psError(PS_ERR_UNKNOWN, false, "Can't find site configuration");
-        goto FAIL;
+        psFree(config);
+        return NULL;
     }
 
@@ -105 +106 @@
         psFree(newImfileArgs);
 
-        goto FAIL;
+        psFree(config);
+        return NULL;
     }
 
@@ -119 +121 @@
         if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\
             psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-            goto FAIL; \
+            psFree(config); \
+            return NULL; \
         } \
     } \
@@ -134 +137 @@
             if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "iteration", 0, "==", n)) {
                 psError(PS_ERR_UNKNOWN, false, "failed to add item iteration");
-                goto FAIL;
+                psFree(config);
+                return NULL;
             }
         }
@@ -148 +152 @@
             if (!psMetadataAddStr(config->where, PS_LIST_TAIL, "camera", 0, "==", str)) {
                 psError(PS_ERR_UNKNOWN, false, "failed to add item camera");
-                goto FAIL;
+                psFree(config);
+                return NULL;
             }
         }
@@ -159 +164 @@
             if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "imfiles", 0, "==", n)) {
                 psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles");
-                goto FAIL;
+                psFree(config);
+                return NULL;
             }
         }
@@ -172 +178 @@
             if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "p1_version", 0, "==", n)) {
                 psError(PS_ERR_UNKNOWN, false, "failed to add item p1_version");
-                goto FAIL;
+                psFree(config);
+                return NULL;
             }
         }
@@ -183 +190 @@
             if (!psMetadataAddBool(config->where, PS_LIST_TAIL, "accept", 0, "==", boolean)) {
                 psError(PS_ERR_UNKNOWN, false, "failed to add item accept");
-                goto FAIL;
+                psFree(config);
+                return NULL;
             }
         }
@@ -199 +207 @@
     if (!config->dbh) {
         psError(PS_ERR_UNKNOWN, false, "Can't configure database");
-        goto FAIL;
+        psFree(config);
+        return NULL;
     }
 
@@ -207 +216 @@
 
     return config;
-
-FAIL:
-    psFree(config);
-    pmConfigDone();
-    psLibFinalize();
-    exit(EXIT_FAILURE);
 }