Changeset 6074

Timestamp:

Jan 19, 2006, 7:23:49 PM (21 years ago)

Author:

jhoblitt

Message:

disable P2_MODE_UPDATE mode
add errorchecking for all functions

File:

• trunk/ippTools/src/chiptool.c (modified) (1 diff)

trunk/ippTools/src/chiptool.c

@@ -2 +2 @@
 
 int main (int argc, char **argv) {
-    psArray         *rawFrames = NULL;
-    psArray         *doneFrames = NULL;
-    psArray         *pendingFrames = NULL;
     p2Config        config;
 
-    p2searchConfig (&config, argc, argv);
+    p2searchConfig(&config, argc, argv);
 
     if (config.mode == P2_MODE_QUICK) {
-        rawFrames = p2searchRawFrames (&config);
-        pendingFrames = p2rawToPending (&config, rawFrames);
-        p2writePendingFrames (&config, pendingFrames);
+        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");
+        }
     }   
 
     if (config.mode == P2_MODE_DEFINE) {
-        rawFrames = p2searchRawFrames (&config);
-        p2insertPendingFrames (&config, rawFrames);
+        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) {
-        pendingFrames = p2searchPendingFrames (&config);
-        p2writePendingFrames (&config, pendingFrames);
+        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_UPDATE) {
-        p2updatePendingFrames (&config, pendingFrames);
+        bool status = p2updatePendingFrames(&config, pendingFrames);
+        if (!status) {
+            psAbort(argv[0], "p2updatePendingFrames() failed");
+        }
     }
+    */
 
     if (config.mode == P2_MODE_DONE) {
-        pendingFrames = p2searchPendingFrames (&config);
-        doneFrames = p2pendingToDone (&config, pendingFrames);
-        p2insertDoneFrames (&config, doneFrames);
+        psArray *pendingFrames = p2searchPendingFrames(&config);
+        if (!pendingiFrames) {
+            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");
+        }
     }