Changeset 25928

Timestamp:

Oct 22, 2009, 4:49:10 PM (17 years ago)

Author:

Paul Price

Message:

psArrayLength returns long, not S64.

File:

• trunk/ippTools/src/pxtools.c (modified) (7 diffs)

trunk/ippTools/src/pxtools.c

@@ -61 +61 @@
         if (!state) {
             psError(PS_ERR_PROGRAMMING, false, "%s not found in row %ld of table %s",
-                    columnName, i, tableName);
+                    columnName, i, tableName);
             return false;
         }
@@ -70 +70 @@
             // if state isn't cleaned or full we can't set it to cleaned
             psError(PS_ERR_PROGRAMMING, true, "%s with state %s may not be exported cleaned",
-                    tableName, state);
+                    tableName, state);
             return false;
         }
@@ -90 +90 @@
     psAssert (entry, "%s should at least have a place-holder", name);
     if (entry->data.str) {
-        psListIterator *iter = psListIteratorAlloc (item->data.list, PS_LIST_HEAD, true);
-        psMetadataItem *item = NULL;
-        while ((item = psListGetAndIncrement(iter))) {
-            // need to change the name and comment
-            psFree (item->name);
-            item->name = psStringCopy (field);
-            psFree (item->comment);
-            item->comment = psStringCopy (op);
-            if (!psMetadataAddItem(where, item, PS_LIST_TAIL, PS_META_DUPLICATE_OK)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to add item %s", field);
-                psFree(where);
-                return false;
-            }
-        }
-        psFree (iter);
+        psListIterator *iter = psListIteratorAlloc (item->data.list, PS_LIST_HEAD, true);
+        psMetadataItem *item = NULL;
+        while ((item = psListGetAndIncrement(iter))) {
+            // need to change the name and comment
+            psFree (item->name);
+            item->name = psStringCopy (field);
+            psFree (item->comment);
+            item->comment = psStringCopy (op);
+            if (!psMetadataAddItem(where, item, PS_LIST_TAIL, PS_META_DUPLICATE_OK)) {
+                psError(PS_ERR_UNKNOWN, false, "failed to add item %s", field);
+                psFree(where);
+                return false;
+            }
+        }
+        psFree (iter);
     }
     return true;
@@ -198 +198 @@
     }
     if (psArrayLength(output) > 1) {
-        psError(PS_ERR_UNKNOWN, true, "unexpected number of rows found in dbversion: %" PRId64,
+        psError(PS_ERR_UNKNOWN, true, "unexpected number of rows found in dbversion: %ld",
                 psArrayLength(output));
         return false;
@@ -221 +221 @@
         return NULL;
     }
-    
+
     psString version = psMetadataLookupStr(NULL, md, "schema_version");
 
@@ -257 +257 @@
         return false;
     }
-    
+
     psMetadataItem *dbversion = psListGet(multi_item->data.list, 0);
     if (!dbversion) {
@@ -272 +272 @@
             return false;
         }
-        
+
         psString import_version = psMetadataLookupStr(NULL, md, "schema_version");
         if (import_version && strcmp(import_version, schema_version)) {