Changeset 9240

Timestamp:

Oct 4, 2006, 1:13:21 PM (20 years ago)

Author:

jhoblitt

Message:

fix a variable naming goof

File:

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

trunk/ippTools/src/regtool.c

@@ -538 +538 @@
 
     // insert 'newImfile's into rawImfile
-    if (psArrayLength(newImfiles) > 0) {
+    if (psArrayLength(output) > 0) {
         // start a transaction so we don't end up half of the imfiles we were
         // trying to update uninserted
         if (!psDBTransaction(config->dbh)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
-            psFree(newImfiles);
-            return false;
-        }
-
-        for (long i = 0; i < psArrayLength(newImfiles); i++) {
+            psFree(output);
+            return false;
+        }
+
+        for (long i = 0; i < psArrayLength(output); i++) {
             // convert newImfile metadata -> newImfile object
-            newImfileRow *object = newImfileObjectFromMetadata(newImfiles->data[i]);
+            newImfileRow *object = newImfileObjectFromMetadata(output->data[i]);
             // convert newImfile object -> rawImfile object
             rawImfileRow *imfile = newToRawImfile(config, object); 
@@ -559 +559 @@
                 psError(PS_ERR_UNKNOWN, false, "failed to create a new rawImfile row");
                 psFree(object);
-                psFree(newImfiles);
+                psFree(output);
                 return false;
             }
@@ -571 +571 @@
                 psFree(imfile);
                 psFree(object);
-                psFree(newImfiles);
+                psFree(output);
                 return false;
             }
@@ -583 +583 @@
                 psError(PS_ERR_UNKNOWN, false, "failed to delete row from the database");
                 psFree(object);
-                psFree(newImfiles);
+                psFree(output);
                 return false;
             }
@@ -592 +592 @@
         if (!psDBCommit(config->dbh)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
-            psFree(newImfiles);
-            return false;
-        }
-    }
-
-    psFree(newImfiles);
+            psFree(output);
+            return false;
+        }
+    }
+
+    psFree(output);
 
     return true;