Changeset 7063 for trunk/ippTools/src/guidetoolConfig.c

Timestamp:

May 3, 2006, 6:08:05 PM (20 years ago)

Author:

jhoblitt

Message:

config style update

File:

• trunk/ippTools/src/guidetoolConfig.c (modified) (7 diffs)

trunk/ippTools/src/guidetoolConfig.c

@@ -91 +91 @@
 
     // parse CLI for these options
-    psMetadata *argSet = NULL;
     switch (config->mode) {
         case PX_MODE_PENDING:
-            argSet = pendingArgs;
+            config->args = psMemIncrRefCounter(pendingArgs);
             break;
         case PX_MODE_DEFINE:
-            argSet = defineArgs;
+            config->args = psMemIncrRefCounter(defineArgs);
             break;
         default:
-            argSet = args;
+            config->args = psMemIncrRefCounter(args);
     }
-    psMemIncrRefCounter(argSet);
 
     bool argErr = false;
@@ -108 +106 @@
         argErr = true;
         fprintf (stderr, "mode argument is required\n");
-    } else if (! psArgumentParse(argSet, &argc, argv) || argc != 1) {
+    } else if (! psArgumentParse(config->args, &argc, argv) || argc != 1) {
         argErr = true;
         fprintf (stderr, "error parsing arguments\n");
@@ -133 +131 @@
     // setup search criterion
 #define addWhereStr(name) \
-    if ((str = psMetadataLookupStr(&status, argSet, "-" #name))) { \
-        if (!psMetadataAddStr(where, PS_LIST_TAIL, #name, 0, "==", str)) {\
+    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); \
-            psFree(where); \
             exit(EXIT_FAILURE); \
         } \
@@ -142 +139 @@
 
     // generate SQL where claus
-    psMetadata *where = psMetadataAlloc();
+    config->where = psMetadataAlloc();
 
 {
@@ -151 +148 @@
     addWhereStr(exp_id);
     // convert '-inst' to 'camera'
-    if ((str = psMetadataLookupStr(&status, argSet, "-inst"))) {
-        if (!psMetadataAddStr(where, PS_LIST_TAIL, "camera", 0, "==", str)) {
+    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");
-            psFree(where);
             exit(EXIT_FAILURE);
         }
@@ -160 +156 @@
     addWhereStr(telescope);
     addWhereStr(exp_type);
-    if ((n = psMetadataLookupS32(&status, argSet, "-imfiles"))) {
-        if (!psMetadataAddS32(where, PS_LIST_TAIL, "imfiles", 0, "==", n)) {
+    if ((n = psMetadataLookupS32(&status, config->args, "-imfiles"))) {
+        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "imfiles", 0, "==", n)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles");
-            psFree(where);
             exit(EXIT_FAILURE);
         }
@@ -170 +165 @@
     addWhereStr(stats);
     addWhereStr(recipe);
-    if ((n = psMetadataLookupS32(&status, argSet, "-p1_version"))) {
-        if (!psMetadataAddS32(where, PS_LIST_TAIL, "p1_version", 0, "==", n)) {
+    if ((n = psMetadataLookupS32(&status, config->args, "-p1_version"))) {
+        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "p1_version", 0, "==", n)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item p1_version");
-            psFree(where);
             exit(EXIT_FAILURE);
         }
     }
 }
-    psFree(argSet);
 
-    if (where->list->n < 1) {
-        psFree(where);
-        where = NULL;
+    if (config->where->list->n < 1) {
+        psFree(config->where);
+        config->where = NULL;
     }
-
-    config->where = where;
 
     // define Database handle, if used