Index: trunk/ippTools/src/chiptoolConfig.c
===================================================================
--- trunk/ippTools/src/chiptoolConfig.c	(revision 5881)
+++ trunk/ippTools/src/chiptoolConfig.c	(revision 6060)
@@ -1,5 +1,7 @@
+#include <pmConfig.h>
+
 # include "p2search.h"
 
-bool p2searchConfig (psConfig *config, int argc, char **argv) {
+bool p2searchConfig (p2Config *config, int argc, char **argv) {
 
     // Parse the configurations (re-org a la ppImage)
@@ -15,29 +17,30 @@
     config->arguments = psMetadataAlloc(); // The arguments, with default values
 
+    int N;
     config->mode = P2_MODE_NONE;
-    if ((N = psArgumentGet (*argc, argv, "-quick"))) {
-	psArgumentRemove (N, argc, argv);
-	if (config->mode) psAbort ("p2search", "only one mode selection is allowed");
-	config->mode = P2_MODE_QUICK;
+    if ((N = psArgumentGet (argc, argv, "-quick"))) {
+	    psArgumentRemove (N, &argc, argv);
+        if (config->mode) psAbort ("p2search", "only one mode selection is allowed");
+        config->mode = P2_MODE_QUICK;
     }
-    if ((N = psArgumentGet (*argc, argv, "-define"))) {
-	psArgumentRemove (N, argc, argv);
-	if (config->mode) psAbort ("p2search", "only one mode selection is allowed");
-	config->mode = P2_MODE_DEFINE;
+    if ((N = psArgumentGet (argc, argv, "-define"))) {
+        psArgumentRemove (N, &argc, argv);
+        if (config->mode) psAbort ("p2search", "only one mode selection is allowed");
+        config->mode = P2_MODE_DEFINE;
     }
-    if ((N = psArgumentGet (*argc, argv, "-pending"))) {
-	psArgumentRemove (N, argc, argv);
-	if (config->mode) psAbort ("p2search", "only one mode selection is allowed");
-	config->mode = P2_MODE_PENDING;
+    if ((N = psArgumentGet (argc, argv, "-pending"))) {
+        psArgumentRemove (N, &argc, argv);
+        if (config->mode) psAbort ("p2search", "only one mode selection is allowed");
+        config->mode = P2_MODE_PENDING;
     }
-    if ((N = psArgumentGet (*argc, argv, "-update"))) {
-	psArgumentRemove (N, argc, argv);
-	if (config->mode) psAbort ("p2search", "only one mode selection is allowed");
-	config->mode = P2_MODE_UPDATE;
+    if ((N = psArgumentGet (argc, argv, "-update"))) {
+        psArgumentRemove (N, &argc, argv);
+        if (config->mode) psAbort ("p2search", "only one mode selection is allowed");
+        config->mode = P2_MODE_UPDATE;
     }
-    if ((N = psArgumentGet (*argc, argv, "-done"))) {
-	psArgumentRemove (N, argc, argv);
-	if (config->mode) psAbort ("p2search", "only one mode selection is allowed");
-	config->mode = P2_MODE_UPDATE;
+    if ((N = psArgumentGet (argc, argv, "-done"))) {
+        psArgumentRemove (N, &argc, argv);
+        if (config->mode) psAbort ("p2search", "only one mode selection is allowed");
+        config->mode = P2_MODE_UPDATE;
     }
 
@@ -47,7 +50,7 @@
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-pending", 0, "examine pending image table, write ppImage output", "");
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-update",  0, "update pending image table", "");
-    psMetadataAddS32(config->arguments, PS_LIST_TAIL, "-time",    0, "define time range of interest", "");
-    psMetadataAddS32(config->arguments, PS_LIST_TAIL, "-camera",  0, "define camera of interest", "");
-    psMetadataAddS32(config->arguments, PS_LIST_TAIL, "-filter",  0, "define filter of interest", "");
+    psMetadataAddS32(config->arguments, PS_LIST_TAIL, "-time",    0, "define time range of interest", 0);
+    psMetadataAddS32(config->arguments, PS_LIST_TAIL, "-camera",  0, "define camera of interest", 0);
+    psMetadataAddS32(config->arguments, PS_LIST_TAIL, "-filter",  0, "define filter of interest", 0);
 
     if (! psArgumentParse(config->arguments, &argc, argv) || argc != 2) {