Changeset 19592

Timestamp:

Sep 16, 2008, 4:13:35 PM (18 years ago)

Author:

eugene

Message:

making set_state and set_label options consistent

Location:

trunk/ippTools/src

Files:

• camtool.c (modified) (1 diff)
• camtoolConfig.c (modified) (1 diff)
• chiptool.c (modified) (1 diff)
• faketool.c (modified) (1 diff)
• faketoolConfig.c (modified) (1 diff)

trunk/ippTools/src/camtool.c

@@ -230 +230 @@
     }
 
-    PXOPT_LOOKUP_STR(state, config->args, "-state", false, false);
-    PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
+    PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
+    PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
 
     if ((!state) && (!label)) {

trunk/ippTools/src/camtoolConfig.c

@@ -74 +74 @@
 
     psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all",               0, "allow everything to be queued without search terms", false);
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set-state",              0, "set state", NULL);
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set-label",              0, "set label", NULL);
-    // XXX change the two above to use -set-state and -set-label?
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_state",              0, "set state", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_label",              0, "set label", NULL);
 
     // -pendingexp

trunk/ippTools/src/chiptool.c

@@ -245 +245 @@
     }
 
-    PXOPT_LOOKUP_STR(state, config->args, "-state", false, false);
+    PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
     PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
 

trunk/ippTools/src/faketool.c

@@ -305 +305 @@
     }
 
-    PXOPT_LOOKUP_STR(state, config->args, "-set-state", false, false);
-    PXOPT_LOOKUP_STR(label, config->args, "-set-label", false, false);
+    PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
+    PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
 
     if ((!state) && (!label)) {

trunk/ippTools/src/faketoolConfig.c

@@ -141 +141 @@
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
 
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set-state", 0,            "set state", NULL);
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set-label", 0,            "set label", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_state", 0,            "set state", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_label", 0,            "set label", NULL);
     psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all",  0,            "allow everything to be queued without search terms", false);