Changeset 11859

Timestamp:

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

Author:

jhoblitt

Message:

properly handle pzgetimfileConfig() errors

Location:

trunk/ippTools/src

Files:

• pzgetimfiles.c (modified) (3 diffs)
• pzgetimfilesConfig.c (modified) (4 diffs)

trunk/ippTools/src/pzgetimfiles.c

@@ -40 +40 @@
 
     pxConfig *config = pzgetimfilesConfig(NULL, argc, argv);
+    if (!config) {
+        psError(PXTOOLS_ERR_CONFIG, false, "failed to configure");
+        goto FAIL;
+    }
 
     if (!go(config)) {
@@ -53 +57 @@
 FAIL:
     psErrorStackPrint(stderr, "\n");
+    int exit_status = pxerrorGetExitStatus();
 
     psFree(config);
@@ -58 +63 @@
     psLibFinalize();
 
-    exit(EXIT_FAILURE);
+    exit(exit_status);
 }
 

trunk/ippTools/src/pzgetimfilesConfig.c

@@ -29 +29 @@
 #include "pxtools.h"
 
-pxConfig *pzgetimfilesConfig(pxConfig *config, int argc, char **argv) {
+pxConfig *pzgetimfilesConfig(pxConfig *config, int argc, char **argv)
+{
     if (!config) {
         config = pxConfigAlloc();
@@ -39 +40 @@
     if (! config->modules) {
         psError(PS_ERR_UNKNOWN, false, "Can't find site configuration!\n");
-        goto FAIL;
+        psFree(config);
+        return NULL;
     }
 
@@ -64 +66 @@
         psArgumentHelp(args);
         psFree(args);
-        goto FAIL;
+        psFree(config);
+        return NULL;
     }
 
@@ -75 +78 @@
     if(!config->dbh) {
         psError(PS_ERR_UNKNOWN, false, "Can't connect to db\n");
-        goto FAIL;
+        psFree(config);
+        return NULL;
     }
 
     return config;
-
-FAIL:
-    psFree(config);
-    pmConfigDone();
-    psLibFinalize();
-    exit(EXIT_FAILURE);
 }