Changeset 34081

Timestamp:

Jun 26, 2012, 11:19:48 AM (14 years ago)

Author:

eugene

Message:

fix a number of cases of unused variables (set but otherwise not used); some of these may have been used to check the presence of a mandatory argument

Location:

trunk/ippTools

Files:

• configure.ac (modified) (2 diffs)
• share/camtool_find_pendingimfile.sql (modified) (1 prop)
• share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• share/pxadmin_create_tables.sql (modified) (1 prop)
• share/warptool_towarped.sql (modified) (1 prop)
• src (modified) (1 prop)
• src/addtool.c (modified) (4 diffs)
• src/bgtool.c (modified) (6 diffs)
• src/camtool.c (modified) (1 diff)
• src/chiptool.c (modified) (5 diffs)
• src/dettool.c (modified) (1 diff)
• src/dettool_processedexp.c (modified) (2 diffs)
• src/dettool_processedimfile.c (modified) (1 diff)
• src/dettool_residexp.c (modified) (1 diff)
• src/dettool_residimfile.c (modified) (1 diff)
• src/difftool.c (modified) (3 diffs)
• src/disttool.c (modified) (4 diffs)
• src/dqstatstool.c (modified) (1 diff)
• src/faketool.c (modified) (1 diff)
• src/laptool.c (modified) (4 diffs)
• src/magicdstool.c (modified) (1 diff)
• src/magictool.c (modified) (1 prop)
• src/mergetool.c (modified) (2 diffs)
• src/minidvodbtool.c (modified) (1 diff)
• src/pstamptool.c (modified) (13 diffs)
• src/pxerrors.c (modified) (1 diff)
• src/pztool.c (modified) (1 diff)
• src/regtool.c (modified) (4 diffs)
• src/stacktool.c (modified) (2 diffs)
• src/staticskytool.c (modified) (2 diffs)
• src/vptool.c (modified) (3 diffs)
• src/warptool.c (modified) (4 diffs)

trunk/ippTools/configure.ac

@@ -8 +8 @@
 AM_MAINTAINER_MODE
 
-IPP_STDCFLAGS
+IPP_STDLDFLAGS
 
 AC_LANG(C)
@@ -57 +57 @@
 
 IPP_STDOPTS
-CFLAGS="${CFLAGS=} -Wall -Werror"
+IPP_STDCFLAGS
 
 IPPDB_VERSION=`$PKG_CONFIG --modversion ippdb`

trunk/ippTools/src/addtool.c

@@ -726 +726 @@
 
     // required
-    PXOPT_LOOKUP_S64(add_id, config->args, "-add_id", true, false);
+    // PXOPT_LOOKUP_S64(add_id, config->args, "-add_id", true, false);
 
     // optional
@@ -735 +735 @@
     PXOPT_LOOKUP_S16(fault,         config->args, "-fault", false, false);
     PXOPT_LOOKUP_S64(stage_extra1, config->args, "-stage_extra1", false, false);
+
     // generate restrictions
     psMetadata *where = psMetadataAlloc();
@@ -1538 +1539 @@
 
     // required
-  PXOPT_LOOKUP_U64(minidvodb_id, config->args, "-minidvodb_id", true, false);
+  // PXOPT_LOOKUP_U64(minidvodb_id, config->args, "-minidvodb_id", true, false);
   PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-minidvodb_group", true, false);
 
@@ -1793 +1794 @@
   psMetadata *where = psMetadataAlloc();
 
-  PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-minidvodb_id", true, false);
+  // PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-minidvodb_id", true, false);
   PXOPT_LOOKUP_S16(fault,  config->args, "-set_fault", false, false);
   PXOPT_LOOKUP_F32(dtime_relphot,  config->args, "-set_dtime_relphot", false, false);

trunk/ippTools/src/bgtool.c

@@ -935 +935 @@
 
     // chip_bg_id is required
-    PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);
+    // PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -1052 +1052 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);
+    // PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -1169 +1169 @@
 
     // required
-    PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);
+    // PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true, false);
     PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
 
@@ -1222 +1222 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true,  false);
+    // PXOPT_LOOKUP_S64(chip_bg_id, config->args, "-chip_bg_id", true,  false);
     PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
     PXOPT_LOOKUP_BOOL(clean,  config->args, "-clean", false);
@@ -2017 +2017 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(warp_bg_id, config->args, "-warp_bg_id", true, false);
+    // PXOPT_LOOKUP_S64(warp_bg_id, config->args, "-warp_bg_id", true, false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -2133 +2133 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    PXOPT_LOOKUP_S64(warp_bg_id, config->args, "-warp_bg_id", true,  false);
+    // PXOPT_LOOKUP_S64(warp_bg_id, config->args, "-warp_bg_id", true,  false);
     PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
     PXOPT_LOOKUP_BOOL(clean,  config->args, "-clean", false);

trunk/ippTools/src/camtool.c

@@ -1270 +1270 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-cam_id", true,  false);
+  // PXOPT_LOOKUP_S64(det_id, config->args, "-cam_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);

trunk/ippTools/src/chiptool.c

@@ -254 +254 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);
+    // PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);
 
     psMetadata *where = psMetadataAlloc();
@@ -346 +346 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);
+    // PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);
 
     psMetadata *where = psMetadataAlloc();
@@ -1017 +1017 @@
     PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "==");
 
-    PXOPT_LOOKUP_S64(cam_id, config->args, "-cam_id", false, false);
+    // PXOPT_LOOKUP_S64(cam_id, config->args, "-cam_id", false, false);
     // if cam_id is not supplied chip_id is required
-    PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", cam_id ? false : true, false);
-    PXOPT_LOOKUP_S64(class_id, config->args, "-class_id", true, false);
+    // PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", cam_id ? false : true, false);
+    // PXOPT_LOOKUP_S64(class_id, config->args, "-class_id", true, false);
     PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", true, false);
 
@@ -1774 +1774 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(dummy, config->args, "-chip_id", true,  false);
+  // PXOPT_LOOKUP_S64(dummy, config->args, "-chip_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);
@@ -1937 +1937 @@
 
 //    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
-    PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
+    // PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);

trunk/ippTools/src/dettool.c

@@ -2116 +2116 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true,  false);
+  // replaced below PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);

trunk/ippTools/src/dettool_processedexp.c

@@ -266 +266 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
+    // PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
     PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
 
@@ -283 +283 @@
 bool updatestateprocessedMode(pxConfig *config) {
   PS_ASSERT_PTR_NON_NULL(config, NULL);
-  PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
+  // PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
   PXOPT_LOOKUP_STR(data_state,config->args, "-data_state", true, false);
 

trunk/ippTools/src/dettool_processedimfile.c

@@ -298 +298 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
+    // PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
     PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
 

trunk/ippTools/src/dettool_residexp.c

@@ -356 +356 @@
 bool updatestateresidMode(pxConfig *config) {
   PS_ASSERT_PTR_NON_NULL(config, NULL);
-  PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
+  // PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
   PXOPT_LOOKUP_STR(data_state,config->args, "-data_state", true, false);
 

trunk/ippTools/src/dettool_residimfile.c

@@ -284 +284 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
+    // PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
     PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
 

trunk/ippTools/src/difftool.c

@@ -1075 +1075 @@
 
     // default
-    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+    // PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false);
 
@@ -2059 +2059 @@
     PXOPT_LOOKUP_BOOL(newTemplates,config->args,"-new-templates", false);
 
-    PXOPT_LOOKUP_BOOL(available, config->args, "-available", false);
+    // PXOPT_LOOKUP_BOOL(available, config->args, "-available", false);
     PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false);
 
@@ -2849 +2849 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-diff_id", true,  false);
+  // PXOPT_LOOKUP_S64(det_id, config->args, "-diff_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);

trunk/ippTools/src/disttool.c

@@ -403 +403 @@
     }
 
+    if (0) {
+        fprintf (stderr, "runJoinStr: %s\n", runJoinStr);
+    }
+
     if (!strcmp(stage, "raw")) {
         if (!no_magic) {
@@ -726 +730 @@
     }
 
+    if (simple) {/* no option? */}
 
     if (pretend) {
@@ -1833 +1838 @@
         psStringAppend(&query, " %s last_fileset = '%s'", sep, last_fileset);
     }
+#else
+    if (0) { fprintf (stderr, "sep: %s\n", sep); }
 #endif
 
@@ -2186 +2193 @@
     PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
 
-    PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
-    PXOPT_LOOKUP_BOOL(full, config->args, "-full", false);
+    // PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
+    // PXOPT_LOOKUP_BOOL(full, config->args, "-full", false);
 
     pxAddLabelSearchArgs (config, where, "-label", "distRun.label", "==");

trunk/ippTools/src/dqstatstool.c

@@ -829 +829 @@
 static bool updaterunMode(pxConfig *config) {
   PS_ASSERT_PTR_NON_NULL(config,false);
-  PXOPT_LOOKUP_S64(dqstats_id, config->args, "-dqstats_id",     true, false);
+  // PXOPT_LOOKUP_S64(dqstats_id, config->args, "-dqstats_id",     true, false);
   PXOPT_LOOKUP_STR(state,      config->args, "-set_state",      true, false);
   PXOPT_LOOKUP_S16(fault,      config->args, "-fault",          false, false);

trunk/ippTools/src/faketool.c

@@ -1263 +1263 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-fake_id", true,  false);
+  // PXOPT_LOOKUP_S64(det_id, config->args, "-fake_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);

trunk/ippTools/src/laptool.c

@@ -464 +464 @@
 
   psMetadata *where = psMetadataAlloc();
-  PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
+
+  // require? PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
   PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "==");
 
@@ -633 +634 @@
 {
   PS_ASSERT_PTR_NON_NULL(config, false);
-  PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
-
+
+  // require? PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
   PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -705 +706 @@
 
   psMetadata *where = psMetadataAlloc();
-  PXOPT_LOOKUP_S64(lap_id,  config->args, "-lap_id",  true, false);
-  PXOPT_LOOKUP_S64(exp_id,  config->args, "-exp_id",  true, false);
-  PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false);
+
+  // test for required opts?
+  // PXOPT_LOOKUP_S64(lap_id,  config->args, "-lap_id",  true, false);
+  // PXOPT_LOOKUP_S64(exp_id,  config->args, "-exp_id",  true, false);
+  // PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false);
 
   PXOPT_LOOKUP_S64(set_chip_id, config->args, "-set_chip_id", false, false);
@@ -841 +844 @@
 {
   PS_ASSERT_PTR_NON_NULL(config, false);
-  PXOPT_LOOKUP_S64(lap_id,          config->args, "-lap_id",          true, false);
+
+  // PXOPT_LOOKUP_S64(lap_id,          config->args, "-lap_id",          true, false);
   
   psMetadata *where = psMetadataAlloc();

trunk/ippTools/src/magicdstool.c

@@ -1343 +1343 @@
 {
     // required
-    PXOPT_LOOKUP_S64(magic_ds_id, config->args, "-magic_ds_id", true, false);
+    // PXOPT_LOOKUP_S64(magic_ds_id, config->args, "-magic_ds_id", true, false);
 
     psMetadata *where = psMetadataAlloc();

trunk/ippTools/src/mergetool.c

@@ -738 +738 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
     psMetadata *where = psMetadataAlloc();
-    PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-merge_id", true, false);
+    // PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-merge_id", true, false);
     PXOPT_COPY_S64(config->args, where, "-merge_id",     "mergedvodbProcessed.merge_id", "==");
     PXOPT_LOOKUP_F32(dtime_merge,  config->args, "-set_dtime_merge", false, false);
@@ -1139 +1139 @@
   PS_ASSERT_PTR_NON_NULL(config, false);
   psMetadata *where = psMetadataAlloc();
-  PXOPT_LOOKUP_U64(mergedvodbcopy_id,  config->args, "-mergedvodbcopy_id", false, false);
-  PXOPT_LOOKUP_U64(merge_id,  config->args, "-merge_id", false, false);
+
+  // require? PXOPT_LOOKUP_U64(mergedvodbcopy_id,  config->args, "-mergedvodbcopy_id", false, false);
+  // require? PXOPT_LOOKUP_U64(merge_id,  config->args, "-merge_id", false, false);
   PXOPT_LOOKUP_STR(state,  config->args, "-state", false, false);
   PXOPT_LOOKUP_STR(host,  config->args, "-host", false, false);
   PXOPT_LOOKUP_STR(rsync_path,  config->args, "-mergedvodb_rsync_path", false, false);
-  PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
+  // PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
   
   PXOPT_LOOKUP_S16(set_fault,  config->args, "-set_fault", false, false);

trunk/ippTools/src/minidvodbtool.c

@@ -411 +411 @@
   PS_ASSERT_PTR_NON_NULL(config, false);
   psMetadata *where = psMetadataAlloc();
-  PXOPT_LOOKUP_U64(minidvodbcopy_id,  config->args, "-minidvodbcopy_id", false, false);
-  PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-minidvodb_id", false, false);
+
+  // PXOPT_LOOKUP_U64(minidvodbcopy_id,  config->args, "-minidvodbcopy_id", false, false);
+  // PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-minidvodb_id", false, false);
   PXOPT_LOOKUP_STR(state,  config->args, "-state", false, false);
   PXOPT_LOOKUP_STR(host,  config->args, "-host", false, false);
   PXOPT_LOOKUP_STR(rsync_path,  config->args, "-minidvodb_rsync_path", false, false);
-  PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
+  // PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
   
   PXOPT_LOOKUP_S16(set_fault,  config->args, "-set_fault", false, false);

trunk/ippTools/src/pstamptool.c

@@ -48 +48 @@
 static bool stopdependentjobMode(pxConfig *config);
 static bool revertjobMode(pxConfig *config);
+
+# if (0)
+// these are unused functions -- since they are 'static', this raises an warning
 static bool addprojectMode(pxConfig *config);
 static bool projectMode(pxConfig *config);
@@ -59 +62 @@
 static bool listfileMode(pxConfig *config);
 static bool deletefileMode(pxConfig *config);
+# endif
 
 # define MODECASE(caseName, func) \
@@ -98 +102 @@
         MODECASE(PSTAMPTOOL_MODE_STOPDEPENDENTJOB, stopdependentjobMode);
         MODECASE(PSTAMPTOOL_MODE_REVERTJOB, revertjobMode);
+# if (0)
         MODECASE(PSTAMPTOOL_MODE_ADDPROJECT, addprojectMode);
         MODECASE(PSTAMPTOOL_MODE_MODPROJECT, modprojectMode);
@@ -109 +114 @@
         MODECASE(PSTAMPTOOL_MODE_LISTFILE, listfileMode);
         MODECASE(PSTAMPTOOL_MODE_DELETEFILE, deletefileMode);
+# endif
         default:
             psAbort("invalid option (this should not happen)");
@@ -693 +699 @@
 static bool addjobMode(pxConfig *config)
 {
-    bool    stampJob = false;
+    bool stampJob = false;
 
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -739 +745 @@
         return false;
     }
+    if (stampJob) { /* do something?? */ }
+
     if (!pstampJobInsert(config->dbh,
             0,          // job_id
@@ -1044 +1052 @@
     // it's an allowed arg because add_poll_args adds it
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    if (limit) { /* do something?? */ }
+
     PXOPT_LOOKUP_S16(fault, config->args, "-fault",  false, false);
 
@@ -1051 +1061 @@
     psString faultClause = psStringCopy("");
     if (!fault) {
-        psStringAppend(&faultClause, " \nAND (pstampJob.fault < %d)", PSTAMP_FIRST_ERROR_CODE);
+        psStringAppend(&faultClause, " \nAND (pstampJob.fault < %d)", PSTAMP_FIRST_ERROR_CODE);
     }
 
     psString query = pxDataGet("pstamptool_revertjob.sql");
     if (!psListLength(where->list) && !all) {
-        psFree(where);
-        psError(PXTOOLS_ERR_CONFIG, false, "search parameters or -all are required");
-        return false;
+        psFree(where);
+        psError(PXTOOLS_ERR_CONFIG, false, "search parameters or -all are required");
+        return false;
     }
     if (psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " AND %s", whereClause);
-        psFree(whereClause);
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&query, " AND %s", whereClause);
+        psFree(whereClause);
     }
     psFree(where);
@@ -1071 +1081 @@
     psString faultCountClause = NULL;
     if (clear_fault_count) {
-        psStringAppend(&faultCountClause, "\n, pstampJob.fault_count = 0");
+        psStringAppend(&faultCountClause, "\n, pstampJob.fault_count = 0");
     } else {
-        psStringAppend(&query, " AND pstampJob.fault_count < %d", PSTAMP_MAX_JOB_FAULTS);
+        psStringAppend(&query, " AND pstampJob.fault_count < %d", PSTAMP_MAX_JOB_FAULTS);
     }
 
     if (!p_psDBRunQueryF(config->dbh, query, faultCountClause, faultClause)) {
-        psFree(faultCountClause);
-        psFree(faultClause);
-        psFree(query);
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
+        psFree(faultCountClause);
+        psFree(faultClause);
+        psFree(query);
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
     }
 
@@ -1090 +1100 @@
     return true;
 }
+
+# if (0)
+// these are unused functions
 static bool addprojectMode(pxConfig *config)
 {
@@ -1103 +1116 @@
 
     if (!pstampProjectInsert(config->dbh,
-            0,
-            name,
-            state,
-            imagedb,
-            dvodb,
-            camera,
-            telescope,
-            need_magic
-        )) {
+                             0,
+                             name,
+                             state,
+                             imagedb,
+                             dvodb,
+                             camera,
+                             telescope,
+                             need_magic
+            )) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -1448 +1461 @@
     // it's an allowed arg because add_poll_args adds it
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    if (limit) { /* do something?? */ }
 
     if (!psListLength(where->list)) {
@@ -1628 +1642 @@
     return true;
 }
+# endif

trunk/ippTools/src/pxerrors.c

@@ -26 +26 @@
 psExit pxerrorGetExitStatus(void) {
 
-    psErrorCode err = psErrorCodeLast ();
+    // psErrorCodeLast returns a psErrorCode, but we are being a bit sleezy and defining a set
+    // of enum values that have non-overlapping-ranges (not enforced by the compiler)
+
+    int err = psErrorCodeLast ();
     switch (err) {
       case PXTOOLS_ERR_SYS:

trunk/ippTools/src/pztool.c

@@ -338 +338 @@
         }
 
-/*         psStringAppend(&query, " ORDER BY dateobs"); */
-/*         if (desc) { */
-/*             psStringAppend(&query, " DESC"); */
-/*         } */
+        if (0) {
+            psStringAppend(&query, " ORDER BY dateobs"); 
+            if (desc) { 
+                psStringAppend(&query, " DESC"); 
+            } 
+        }
 
         // request the full "limit" from each known camera and throw away any

trunk/ippTools/src/regtool.c

@@ -613 +613 @@
     PXOPT_LOOKUP_F32(teltemp_extra, config->args, "-teltemp_extra", false, false);
     PXOPT_LOOKUP_F32(pon_time, config->args, "-pon_time", false, false);
-    PXOPT_LOOKUP_S16(burntool_state, config->args, "-burntool_state", false, false);
+    // PXOPT_LOOKUP_S16(burntool_state, config->args, "-burntool_state", false, false);
     PXOPT_LOOKUP_F64(user_1, config->args, "-user_1", false, false);
     PXOPT_LOOKUP_F64(user_2, config->args, "-user_2", false, false);
@@ -1664 +1664 @@
   PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
 
-  PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+  // XXX unused PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
   psString query = pxDataGet("regtool_finishcompressexp.sql");
@@ -1792 +1792 @@
   psStringPrepend(&whereClause,"\n AND ");
   PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
-  PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+  // PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
   psString limitString = NULL;
@@ -2033 +2033 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-exp_id", true,  false);
+  // unused and wrong! PXOPT_LOOKUP_S64(det_id, config->args, "-exp_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);

trunk/ippTools/src/stacktool.c

@@ -810 +810 @@
 
     // XXX require at least a stack id (add better search options)
-    PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", true, false);
+    // PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", true, false);
 
     psMetadata *where = psMetadataAlloc();
@@ -1697 +1697 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-stack_id", true,  false);
+  // PXOPT_LOOKUP_S64(det_id, config->args, "-stack_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);

trunk/ippTools/src/staticskytool.c

@@ -424 +424 @@
 
     // XXX require at least a sky id (add better search options)
-    PXOPT_LOOKUP_S64(sky_id, config->args, "-sky_id", true, false);
+    // PXOPT_LOOKUP_S64(sky_id, config->args, "-sky_id", true, false);
 
     psMetadata *where = psMetadataAlloc();
@@ -797 +797 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-sky_id", true,  false);
+  // XXX unused PXOPT_LOOKUP_S64(det_id, config->args, "-sky_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);

trunk/ippTools/src/vptool.c

@@ -129 +129 @@
         GET_VALUE (psString, Str, raw_workdir,   "workdir");
         GET_VALUE (psString, Str, raw_label,     "label");
-        GET_VALUE (psString, Str, raw_reduction, "reduction");
+        // GET_VALUE (psString, Str, raw_reduction, "reduction");
         // GET_VALUE (psString, Str, raw_expgroup,  "expgroup");
-        GET_VALUE (psString, Str, raw_dvodb,     "dvodb");
-        GET_VALUE (psString, Str, raw_tess_id,   "tess_id");
-        GET_VALUE (psString, Str, raw_end_stage, "end_stage");
+        // GET_VALUE (psString, Str, raw_dvodb,     "dvodb");
+        // GET_VALUE (psString, Str, raw_tess_id,   "tess_id");
+        // GET_VALUE (psString, Str, raw_end_stage, "end_stage");
 
         if (!row->exp_id) {
@@ -176 +176 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);
-
+    // PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);
 
     PXOPT_LOOKUP_STR(label, config->args, "-set_label", true, false);
@@ -672 +671 @@
     PXOPT_COPY_S16(config->args, where, "-fault", "vpProcessedCell.fault", "==");
 
-    PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
+    // PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
 
     if (!psListLength(where->list)) {

trunk/ippTools/src/warptool.c

@@ -1185 +1185 @@
     pxAddLabelSearchArgs (config, where, "-label", "label", "==");
 
-    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    // PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
 
     psString query = pxDataGet("warptool_finished_run_select.sql");
@@ -1831 +1831 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", true, false);
+    // PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", true, false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -2169 +2169 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(det_id,  config->args, "-warp_id", true,  false);
+    // PXOPT_LOOKUP_S64(det_id,  config->args, "-warp_id", true,  false);
     PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
     PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);
@@ -2358 +2358 @@
     pxAddLabelSearchArgs (config, where, "-label",     "warpRun.label", "LIKE");
 
-//    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
-    PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
+    // PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
+    // PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);