Changeset 10029

Timestamp:

Nov 16, 2006, 3:59:09 PM (20 years ago)

Author:

jhoblitt

Message:

remove support for generating exp_tags()
fix early exit()
fix memory leaks

File:

• trunk/ippTools/src/pzgetexp.c (modified) (9 diffs)

trunk/ippTools/src/pzgetexp.c

@@ -84 +84 @@
             lastFileSet = psMetadataLookupStr(&status, output->data[0], "exp_id");
         }
+
+        psFree(output);
     }
 
@@ -106 +108 @@
     if (!output) {
         psError(PS_ERR_UNKNOWN, true, "popen() failed");
-        goto FAIL;
+        return false;
     }
     psString cmdOutput = psSlurpFile(output);
@@ -116 +118 @@
         // XXX not nessicarily an error
         psError(PS_ERR_UNKNOWN, true, "no new fileSet/exp IDs");
-        goto FAIL;
+        return false;
     }
     if (!psArrayLength(newSummitExps)) {
@@ -132 +134 @@
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(newSummitExps);
-            goto FAIL;
+            return false;
         }
     }
@@ -143 +145 @@
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(newSummitExps);
-            goto FAIL;
+            return false;
         }
         // sanity check that we actually inserted something
@@ -149 +151 @@
             psError(PS_ERR_UNKNOWN, false, "database error -- we should have inserted at least one row");
             psFree(newSummitExps);
-            goto FAIL;
+            return false;
         }
     }
@@ -163 +165 @@
             "       incoming.exp_id,"
             "       incoming.camera,"
-            "       incoming.telescope,"
-            "       gentag(incoming.exp_id)"
+            "       incoming.telescope"
             "   FROM incoming"
             "   LEFT JOIN summitExp"
@@ -175 +176 @@
         if (!p_psDBRunQuery(config->dbh, query)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
-            goto FAIL;
+            return false;
         }
     }
@@ -196 +197 @@
         if (!p_psDBRunQuery(config->dbh, query)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
-            goto FAIL;
-        }
-    }
-
-    psFree(config);
-
-    exit(EXIT_SUCCESS);
-
-FAIL:
-    psFree(config);
-
-    exit(EXIT_FAILURE);
+            return false;
+        }
+    }
+
+    return true;
 }