Changeset 34052 for branches/eam_branches/ipp-20120601/ippTools/src

Timestamp:

Jun 22, 2012, 6:52:56 AM (14 years ago)

Author:

eugene

Message:

changes to satisfy more pedantic gcc

File:

• branches/eam_branches/ipp-20120601/ippTools/src/pstamptool.c (modified) (5 diffs)

branches/eam_branches/ipp-20120601/ippTools/src/pstamptool.c

@@ -1046 +1046 @@
     // 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 (limit) { /* do something?? */ }
 
     PXOPT_LOOKUP_S16(fault, config->args, "-fault",  false, false);
@@ -1055 +1055 @@
     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);
@@ -1075 +1075 @@
     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;
     }
 
@@ -1094 +1094 @@
     return true;
 }
+
 static bool addprojectMode(pxConfig *config)
 {
@@ -1107 +1108 @@
 
     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;