Changeset 31445

Timestamp:

May 5, 2011, 10:33:46 AM (15 years ago)

Author:

eugene

Message:

fix un-inited values and printing type mismatches

Location:

trunk/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) (1 prop)
• src/pzgetimfiles.c (modified) (2 diffs)
• src/pztool.c (modified) (3 diffs)
• src/stacktool.c (modified) (1 diff)

trunk/ippTools/src/pzgetimfiles.c

@@ -125 +125 @@
     if (status != 0) {
         // mark the summitExp row as faulted
-        if (!p_psDBRunQueryF(config->dbh, "UPDATE summitExp SET fault = %d WHERE summit_id = %ld", WEXITSTATUS(status), summit_id)) {
+        if (!p_psDBRunQueryF(config->dbh, "UPDATE summitExp SET fault = %d WHERE summit_id = %lld", WEXITSTATUS(status), (long long) summit_id)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
         }
@@ -141 +141 @@
         // download an "empty" fileset.
         // mark the summitExp row as faulted
-        if (!p_psDBRunQueryF(config->dbh, "UPDATE summitExp SET fault = %d WHERE summit_id = %ld", 250, summit_id)) {
+        if (!p_psDBRunQueryF(config->dbh, "UPDATE summitExp SET fault = %d WHERE summit_id = %lld", 250, (long long) summit_id)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
         }

trunk/ippTools/src/pztool.c

@@ -638 +638 @@
     // set pzDownloadExp.state to 'stop'
     if (!pzDownloadExpSetState(config, summit_id, "stop")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to change pzDownloadExp.state for %ld", summit_id);
+        psError(PS_ERR_UNKNOWN, false, "failed to change pzDownloadExp.state for %lld", (long long) summit_id);
         return false;
     }
@@ -913 +913 @@
     char *query = "UPDATE pzDownloadExp SET state = '%s' WHERE summit_id = %ld";
     if (!p_psDBRunQueryF(config->dbh, query, state, summit_id)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to change state for %ld", summit_id);
+        psError(PS_ERR_UNKNOWN, false, "failed to change state for %lld", (long long) summit_id);
         return false;
     }
@@ -927 +927 @@
 
   if (!pzDownloadExpSetState(config,summit_id, state)) {
-    psError(PS_ERR_UNKNOWN, false, "failed to change state for %ld", summit_id);
+    psError(PS_ERR_UNKNOWN, false, "failed to change state for %lld", (long long) summit_id);
     return false;
   }

trunk/ippTools/src/stacktool.c

@@ -487 +487 @@
         // Define the requested association, and insert it if it doesn't already exist
         stackAssociationRow *association = pxStackAssociationDefine(config,stack_id);
-        psS64 sass_id;
+        psS64 sass_id=-1;
         if (!association->sass_id) {
           psTrace("stacktool.association",2,"No required Association found. Adding.");