Changeset 34081 for trunk/ippTools/src/pstamptool.c

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/src

Files:

• . (modified) (1 prop)
• pstamptool.c (modified) (13 diffs)

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