Changeset 11855 for trunk/ippTools/src/dettoolConfig.c

Timestamp:

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

Author:

jhoblitt

Message:

properly hanlde dettoolConfig() errors

File:

• trunk/ippTools/src/dettoolConfig.c (modified) (12 diffs)

trunk/ippTools/src/dettoolConfig.c

@@ -27 +27 @@
 #include "dettool.h"
 
-// this function can not fail -- exits on error
 pxConfig *dettoolConfig(pxConfig *config, int argc, char **argv) {
     if (!config) {
@@ -39 +38 @@
     if (!config->modules) {
         psError(PS_ERR_UNKNOWN, false, "Can't find site configuration");
-        goto FAIL;
+        psFree(config);
+        return NULL;
     }
 
@@ -785 +785 @@
             psFree(argset); \
             psFree(argSets); \
-            goto FAIL; \
+            psFree(config); \
+            return NULL; \
         } \
         config->mode = modeval; \
@@ -873 +874 @@
         psFree(iter);
         psFree(argSets);
-        goto FAIL;
+        psFree(config);
+        return NULL;
     }
 
@@ -886 +888 @@
         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; \
         } \
     } \
@@ -901 +904 @@
             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;
             }
         }
@@ -915 +919 @@
             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;
             }
         }
@@ -927 +932 @@
             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;
             }
         }
@@ -939 +945 @@
             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;
             }
         }
@@ -951 +958 @@
             if (!psMetadataAddBool(config->where, PS_LIST_TAIL, "accept", 0, "==", !boolean)) {
                 psError(PS_ERR_UNKNOWN, false, "failed to add item reject");
-                goto FAIL;
+                psFree(config);
+                return NULL;
             }
         }
@@ -967 +975 @@
     if (!config->dbh) {
         psError(PS_ERR_UNKNOWN, false, "Can't configure database");
-        goto FAIL;
+        psFree(config);
+        return NULL;
     }
 
@@ -975 +984 @@
 
     return config;
-
-FAIL:
-    psFree(config);
-    pmConfigDone();
-    psLibFinalize();
-    exit(EXIT_FAILURE);
 }