Changeset 6978 for trunk/ippTools/src/pztoolConfig.c

Timestamp:

Apr 24, 2006, 5:35:03 PM (20 years ago)

Author:

jhoblitt

Message:

cleanups:

all cli utils have thier own .h
make *Config() funcs consistent

File:

• trunk/ippTools/src/pztoolConfig.c (modified) (5 diffs)

trunk/ippTools/src/pztoolConfig.c

@@ +1 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <pmConfig.h>
 
 #include "pxtools.h"
 
-bool pzsearchConfig(pxConfig *config, int argc, char **argv) {
-    PS_ASSERT_PTR_NON_NULL(config, false);
+pxConfig *pzsearchConfig(pxConfig *config, int argc, char **argv) {
+    if (!config) {
+        config = pxConfigAlloc();
+    }
 
     if (! pmConfigRead(&config->site, &config->camera, &config->recipe, &argc, argv, RECIPE)) {
@@ -95 +101 @@
             psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
             psFree(where);
-            return NULL;
+            exit(EXIT_FAILURE);
         }
     }
@@ -102 +108 @@
             psError(PS_ERR_UNKNOWN, false, "failed to add item class");
             psFree(where);
-            return NULL;
+            exit(EXIT_FAILURE);
         }
     }
@@ -109 +115 @@
             psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
             psFree(where);
-            return NULL;
+            exit(EXIT_FAILURE);
         }
     }
@@ -123 +129 @@
     config->dbh = pmConfigDB(config->site);
 
-    return true;
+    return config;
 }