Changeset 17226 for trunk/ippTools/src/camtool.c

Timestamp:

Mar 28, 2008, 5:00:10 PM (18 years ago)

Author:

jhoblitt

Message:

implement warptool -revertwarped query support

File:

• trunk/ippTools/src/camtool.c (modified) (5 diffs)

trunk/ippTools/src/camtool.c

@@ -162 +162 @@
         && !psMetadataLookupBool(NULL, config->args, "-all")) {
         psFree(where);
-        where = NULL;
         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
         return false;
@@ -179 +178 @@
     if (!query) {
         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psFree(where);
         return false;
     }
@@ -184 +184 @@
     if (where && psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, "");
-        psFree(where);
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
     }
+
+    psFree(where);
 
     if (!p_psDBRunQuery(config->dbh, query)) {
@@ -342 +343 @@
         && !psMetadataLookupBool(NULL, config->args, "-all")) {
         psFree(where);
-        where = NULL;
         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
         return false;
@@ -843 +843 @@
         && !psMetadataLookupBool(NULL, config->args, "-all")) {
         psFree(where);
-        where = NULL;
         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
         return false;