Changeset 6338

Timestamp:

Feb 7, 2006, 10:27:31 AM (20 years ago)

Author:

jhoblitt

Message:

add pxConfigAlloc()
change p0search[Config] to use pxConfigAlloc()

Location:

trunk/ippTools/src

Files:

• Makefile.am (modified) (1 diff)
• pxconfig.c (added)
• pxtools.h (modified) (1 diff)
• regtool.c (modified) (1 diff)
• regtoolConfig.c (modified) (1 diff)

trunk/ippTools/src/Makefile.am

@@ -13 +13 @@
     p2searchPendingFrames.c \
     p2updatePending.c \
+        pxconfig.c \
         pxframes.c \
     pxtables.c

trunk/ippTools/src/pxtools.h

@@ -97 +97 @@
 );
 
+pxConfig *pxConfigAlloc(void);
+
 bool pxCreateTables (pxConfig *config);
 bool pxDeleteTables (pxConfig *config);

trunk/ippTools/src/regtool.c

@@ -11 +11 @@
 int main(int argc, char **argv)
 {
-    pxConfig        config; 
-
-    p0searchConfig(&config, argc, argv);
-
-    switch (config.mode) {
+    pxConfig *config = pxConfigAlloc();
+
+    p0searchConfig(config, argc, argv);
+
+    switch (config->mode) {
         case PX_MODE_PENDING:
-            if (!pendingMode(&config)) {
+            if (!pendingMode(config)) {
                 exit(EXIT_FAILURE);
             }
             break;
         case PX_MODE_UPDATE:
-            if (!updateMode(&config)) {
+            if (!updateMode(config)) {
                 exit(EXIT_FAILURE);
             }

trunk/ippTools/src/regtoolConfig.c

@@ -5 +5 @@
 bool p0searchConfig(pxConfig *config, int argc, char **argv) {
     PS_ASSERT_PTR_NON_NULL(config, false);
-
-    // Parse the configurations (re-org a la ppImage)
-    config->site    = NULL;             // Site configuration
-    config->camera  = NULL;             // Camera configuration (unused)
-    config->recipe  = NULL;             // Recipe configuration
-    config->camera_name = NULL;         // Camera name
-    config->filter  = NULL;             // Filter name
-    config->exp_id  = NULL;             // Exposure ID
-    config->class   = NULL;             
-    config->class_id = NULL;           
-    config->url     = NULL;
 
     if (! pmConfigRead(&config->site, &config->camera, &config->recipe, &argc, argv, RECIPE)) {