Changeset 31146 for branches/eam_branches/ipp-20110213/ippTools

Timestamp:

Apr 4, 2011, 11:09:34 AM (15 years ago)

Author:

eugene

Message:

merging from trunk

Location:

branches/eam_branches/ipp-20110213/ippTools

Files:

• share/camtool_find_pendingimfile.sql (modified) (1 prop)
• share/pxadmin_create_tables.sql (modified) (1 prop)
• src (modified) (1 prop)
• src/magictool.c (modified) (3 diffs, 1 prop)

branches/eam_branches/ipp-20110213/ippTools/src/magictool.c

@@ -873 +873 @@
         return false;
     }
-    psFree(whereString);
     psFree(query);
 
@@ -915 +914 @@
             }
 
-            whereString = NULL;
-            psStringAppend(&whereString, "\nAND (magic_id = %" PRId64 ")", magic_id);
-            if (!p_psDBRunQueryF(config->dbh, query, whereString )) {
+            psString whereString2 = NULL;
+            psStringAppend(&whereString2, "\nAND (magic_id = %" PRId64 ")", magic_id);
+            if (!p_psDBRunQueryF(config->dbh, query, whereString2 )) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
-                psFree(whereString);
+                psFree(whereString2);
                 psFree(query);
                 return false;
             }
-            psFree(whereString);
+            psFree(whereString2);
             psArray *magicTree = p_psDBFetchResult(config->dbh);
             if (!magicTree) {
@@ -1022 +1021 @@
         return false;
     }
+    psFree(whereString);
     psFree(query);