Changeset 23352 for branches/cnb_branches/cnb_branch_20090301/ippTools/src/pxtools.c

Timestamp:

Mar 17, 2009, 12:08:50 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ippTools/src/pxtools.c (modified) (2 diffs)

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

@@ -30 +30 @@
     PS_ASSERT_PTR_NON_NULL(state, false);
     
-    // XXX replace strncmp with strcmp
-
     if (!strcmp(state, "new")) return true;
     if (!strcmp(state, "reg")) return true;
@@ -38 +36 @@
     if (!strcmp(state, "wait")) return true;
     if (!strcmp(state, "goto_cleaned")) return true;
+    if (!strcmp(state, "error_cleaned")) return true;
+    if (!strcmp(state, "goto_scrubbed")) return true;
+    if (!strcmp(state, "error_scrubbed")) return true;
     if (!strcmp(state, "cleaned")) return true;
     if (!strcmp(state, "update")) return true;
     if (!strcmp(state, "purged")) return true;
     if (!strcmp(state, "goto_purged")) return true;
+    if (!strcmp(state, "error_purged")) return true;
 
     return false;
 }
+
+// 'scrubbed' is a virtual state equivalent to cleaned, but allows files to be removed
+// even if the config files is missing