Context Navigation

magicdstool.c

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111122/ippTools/src

Files:

Property svn:ignore

Property svn:mergeinfo changed

/branches/haf_add201112/ippTools/src (added)	merged: 32980,32986,33003,33023,33027
/trunk/ippTools/src	merged: 32942-32943,32960,32962,32975,33030-33031,33042-33043,33109,33111-33112,33119,33331-33337,33343,33384-33385,33525,33533,33617,33619,33625

-              r32668
+              r33638
     case IPP_STAGE_CAMERA:
         query = NULL;
         clearRunQuery = "UPDATE chipBackgroundRun SET magicked = 0 where chip_bg_id = %" PRId64;
+        clearRunQuery = "UPDATE camRun SET magicked = 0 where cam_id = %" PRId64;
         break;
     case IPP_STAGE_WARP:
 …
         } else if (!strcmp(state, "failed_cleanup")) {
             new_state = "goto_cleaned";
+        } else if (!strcmp(state, "failed_restore")) {
+            new_state = "goto_restored";
         } else {
             psError(PS_ERR_UNKNOWN, true, "unexpected value for state: %s", state);
 …
           (strcmp(state, "drop") == 0) ||
           (strcmp(state, "wait") == 0) ||
+          (strcmp(state, "failed_restore") == 0) ||
           (strcmp(state, "failed_revert") == 0) ||
           (strcmp(state, "failed_revert_ud") == 0) ||

Note: See TracChangeset for help on using the changeset viewer.