Index: trunk/ippTools/src/chiptool.c
===================================================================
--- trunk/ippTools/src/chiptool.c	(revision 5881)
+++ trunk/ippTools/src/chiptool.c	(revision 6060)
@@ -3,34 +3,36 @@
 int main (int argc, char **argv) {
 
-    psArray *rawFrames;
-    psArray *doneFrames;
-    psArray *pendingFrames;
+    psArray *rawFrames = NULL;
+    psArray *doneFrames = NULL;
+    psArray *pendingFrames = NULL;
+
+    p2Config        config;
 
     p2searchConfig (&config, argc, argv);
 
-    if (config->mode == P2_MODE_QUICK) {
-	rawFrames = p2searchRawFrames (config);
-	pendingFrames = p2rawToPending (config, rawFrames);
-	p2writePendingFrames (config, pendingFrames);
+    if (config.mode == P2_MODE_QUICK) {
+        rawFrames = p2searchRawFrames (&config);
+        pendingFrames = p2rawToPending (&config, rawFrames);
+        p2writePendingFrames (&config, pendingFrames);
     }	
 
-    if (config->mode == P2_MODE_DEFINE) {
-	rawFrames = p2searchRawFrames (config);
-	p2insertPendingFrames (config, rawFrames);
+    if (config.mode == P2_MODE_DEFINE) {
+        rawFrames = p2searchRawFrames (&config);
+        p2insertPendingFrames (&config, rawFrames);
     }
 
-    if (config->mode == P2_MODE_PENDING) {
-	pendingFrames = p2searchPendingFrames (config, FALSE);
-	p2writePendingImages (config, pendingFrames);
+    if (config.mode == P2_MODE_PENDING) {
+        pendingFrames = p2searchPendingFrames (&config);
+        p2writePendingFrames (&config, pendingFrames);
     }
 
-    if (config->mode == P2_MODE_UPDATE) {
-	p2updatePendingFrames (config, pendingFrames);
+    if (config.mode == P2_MODE_UPDATE) {
+        p2updatePendingFrames (&config, pendingFrames);
     }
 
-    if (config->mode == P2_MODE_DONE) {
-	pendingFrames = p2searchPendingFrames (config, TRUE);
-	doneFrames = p2pendingToDone (config);
-	p2insertDoneFrames (config, doneFrames);
+    if (config.mode == P2_MODE_DONE) {
+        pendingFrames = p2searchPendingFrames (&config);
+        doneFrames = p2pendingToDone (&config, pendingFrames);
+        p2insertDoneFrames (&config, doneFrames);
     }