Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ippTools/src/dettool_stack.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/dettool_stack.c (modified) (4 diffs)

branches/cnb_branches/cnb_branch_20090301/ippTools/src

@@ -33 +33 @@
 pstamptool
 disttool
+receivetool

@@ -33 +33 @@
 pstamptool
 disttool
+receivetool

branches/cnb_branches/cnb_branch_20090301/ippTools/src/dettool_stack.c

@@ -127 +127 @@
     PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
 
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
-
-    // Required if code == 0
-    PXOPT_LOOKUP_STR(uri, config->args, "-uri", (code == 0), false);
-    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", (code == 0), false);
+    PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
+
+    // Required if fault == 0
+    PXOPT_LOOKUP_STR(uri, config->args, "-uri", (fault == 0), false);
+    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", (fault == 0), false);
 
     // optional
@@ -188 +188 @@
             user_4,
             user_5,
-            "full",
-            code
+            "full",
+            fault
         );
 
@@ -286 +286 @@
     PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "==");
     PXOPT_COPY_STR(config->args, where, "-class_id",  "class_id", "==");
-    PXOPT_COPY_S16(config->args, where, "-code",      "fault", "==");
+    PXOPT_COPY_S16(config->args, where, "-fault",      "fault", "==");
 
     psString query = pxDataGet("dettool_revertstacked.sql");
@@ -326 +326 @@
 
     if (!setStackedImfileDataState(config, det_id, iteration, class_id, data_state)) {
-        return false;
+        return false;
     }
     return true;

@@ -33 +33 @@
 pstamptool
 disttool
+receivetool