Changeset 11086

Timestamp:

Jan 12, 2007, 4:28:16 PM (19 years ago)

Author:

eugene

Message:

fixed error codes

File:

• trunk/ippTools/src/regtoolConfig.c (modified) (10 diffs)

trunk/ippTools/src/regtoolConfig.c

@@ -30 +30 @@
 // this function can not fail -- exits on error
 pxConfig *p0toolConfig(pxConfig *config, int argc, char **argv) {
+
+    psExit exit_status = PS_EXIT_SUCCESS;
+
     if (!config) {
         config = pxConfigAlloc();
@@ -37 +40 @@
     config->modules = pmConfigRead(&argc, argv, NULL);
     if (!config->modules) {
-        psError(PS_ERR_UNKNOWN, false, "Can't find site configuration");
+        psError(PXTOOLS_ERR_CONFIG, false, "Can't find site configuration");
         goto FAIL;
     }
@@ -211 +214 @@
         psArgumentRemove (N, &argc, argv); \
         if (config->mode) { \
-            psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed"); \
+            psError(PXTOOLS_ERR_CONFIG, true, "only one mode selection is allowed"); \
             goto FAIL; \
         } \
@@ -218 +221 @@
     } \
     if (!psMetadataAddMetadata(argSets, PS_LIST_TAIL, option, 0, NULL, argset)) {;\
-        psError(PS_ERR_UNKNOWN, false, "failed to add argset for %s", option);\
+        psError(PXTOOLS_ERR_PROG, false, "failed to add argset for %s", option);\
     } \
     psFree(argset); \
@@ -236 +239 @@
     bool argErr = false;
     if (config->mode == P0TOOL_MODE_NONE) {
+        psError(PXTOOLS_ERR_CONFIG, false, "missing mode argument");
+        fprintf (stderr, "mode argument is required\n");
         argErr = true;
-        fprintf (stderr, "mode argument is required\n");
     } else if (! psArgumentParse(config->args, &argc, argv) || argc != 1) {
+        psError(PXTOOLS_ERR_CONFIG, false, "unknown argument");
+        fprintf (stderr, "error parsing arguments\n");
         argErr = true;
-        fprintf (stderr, "error parsing arguments\n");
     }
 
@@ -272 +277 @@
     if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
         if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\
-            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
+            psError(PXTOOLS_ERR_PROG, false, "failed to add item " #name); \
             goto FAIL; \
         } \
@@ -288 +293 @@
         if ((str = psMetadataLookupStr(&status, config->args, "-inst"))) {
             if (!psMetadataAddStr(config->where, PS_LIST_TAIL, "camera", 0, "==", str)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to add item camera");
+                psError(PXTOOLS_ERR_PROG, false, "failed to add item camera");
                 goto FAIL;
             }
@@ -300 +305 @@
         if ((imfiles = psMetadataLookupS32(&status, config->args, "-imfiles"))) {
             if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "imfiles", 0, "==", imfiles)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles");
+                psError(PXTOOLS_ERR_PROG, false, "failed to add item imfiles");
                 goto FAIL;
             }
@@ -318 +323 @@
     config->dbh = pmConfigDB(config->modules);
     if (!config->dbh) {
-        psError(PS_ERR_UNKNOWN, false, "Can't configure database");
+        psError(PXTOOLS_ERR_SYS, false, "Can't configure database");
         goto FAIL;
     }
@@ -330 +335 @@
 
 FAIL:
+    // use the top-most error to determine the exit status
+    exit_status = pxerrorGetExitStatus();
+
     psFree(config);
     pmConfigDone();
     psLibFinalize();
-    exit(EXIT_FAILURE);
+    exit(exit_status);
 }