Index: /trunk/ippTools/src/chiptool.c
===================================================================
--- /trunk/ippTools/src/chiptool.c	(revision 6103)
+++ /trunk/ippTools/src/chiptool.c	(revision 6104)
@@ -6,41 +6,45 @@
     p2searchConfig(&config, argc, argv);
 
-    if (config.mode == P2_MODE_QUICK) {
-        psArray *rawFrames = p2searchRawFrames(&config);
-        if (!rawFrames) {
-            psAbort(argv[0], "p2searchRawFrames() failed");
+    switch (config.mode) {
+        case P2_MODE_QUICK:
+        {
+            psArray *rawFrames = p2searchRawFrames(&config);
+            if (!rawFrames) {
+                psAbort(argv[0], "p2searchRawFrames() failed");
+            }
+            psArray *pendingFrames = p2rawToPending(&config, rawFrames);
+            if (!pendingFrames) {
+                psAbort(argv[0], "p2rawToPending() failed");
+            }
+            bool status = p2writePendingFrames(&config, pendingFrames);
+            if (!status) {
+                psAbort(argv[0], "p2writePendingFrames() failed");
+            }
         }
-        psArray *pendingFrames = p2rawToPending(&config, rawFrames);
-        if (!pendingFrames) {
-            psAbort(argv[0], "p2rawToPending() failed");
+            break;
+        case P2_MODE_DEFINE:
+        {
+            psArray *rawFrames = p2searchRawFrames(&config);
+            if (!rawFrames) {
+                psAbort(argv[0], "p2searchRawFrames() failed");
+            }
+            bool status = p2insertPendingFrames(&config, rawFrames);
+            if (!status) {
+                psAbort(argv[0], "p2insertPendingFrames() failed");
+            }
         }
-        bool status = p2writePendingFrames(&config, pendingFrames);
-        if (!status) {
-            psAbort(argv[0], "p2writePendingFrames() failed");
+            break;
+        case P2_MODE_PENDING:
+        {
+            psArray *pendingFrames = p2searchPendingFrames(&config);
+            if (!pendingFrames) {
+                psAbort(argv[0], "p2searchPendingFrames() failed");
+            }
+            bool status = p2writePendingFrames(&config, pendingFrames);
+            if (!status) {
+                psAbort(argv[0], "p2insertPendingFrames() failed");
+            }
         }
-    }	
-
-    if (config.mode == P2_MODE_DEFINE) {
-        psArray *rawFrames = p2searchRawFrames(&config);
-        if (!rawFrames) {
-            psAbort(argv[0], "p2searchRawFrames() failed");
-        }
-        bool status = p2insertPendingFrames(&config, rawFrames);
-        if (!status) {
-            psAbort(argv[0], "p2insertPendingFrames() failed");
-        }
-    }
-
-    if (config.mode == P2_MODE_PENDING) {
-        psArray *pendingFrames = p2searchPendingFrames(&config);
-        if (!pendingFrames) {
-            psAbort(argv[0], "p2searchPendingFrames() failed");
-        }
-        bool status = p2writePendingFrames(&config, pendingFrames);
-        if (!status) {
-            psAbort(argv[0], "p2insertPendingFrames() failed");
-        }
-    }
-
+            break;
     /*
     if (config.mode == P2_MODE_UPDATE) {
@@ -51,18 +55,22 @@
     }
     */
-
-    if (config.mode == P2_MODE_DONE) {
-        psArray *pendingFrames = p2searchPendingFrames(&config);
-        if (!pendingFrames) {
-            psAbort(argv[0], "p2searchPendingFrames() failed");
+        case P2_MODE_DONE:
+        {
+            psArray *pendingFrames = p2searchPendingFrames(&config);
+            if (!pendingFrames) {
+                psAbort(argv[0], "p2searchPendingFrames() failed");
+            }
+            psArray *doneFrames = p2pendingToDone(&config, pendingFrames);
+            if (!doneFrames) {
+                psAbort(argv[0], "p2pendingToDone() failed");
+            }
+            bool status = p2insertDoneFrames(&config, doneFrames);
+            if (!status) {
+                psAbort(argv[0], "p2insertDoneFrames() failed");
+            }
         }
-        psArray *doneFrames = p2pendingToDone(&config, pendingFrames);
-        if (!doneFrames) {
-            psAbort(argv[0], "p2pendingToDone() failed");
-        }
-        bool status = p2insertDoneFrames(&config, doneFrames);
-        if (!status) {
-            psAbort(argv[0], "p2insertDoneFrames() failed");
-        }
+            break;
+        default:
+            psAbort (argv[0], "invalid option (this should not happen)");
     }