Changeset 7657

Timestamp:

Jun 23, 2006, 11:58:12 AM (20 years ago)

Author:

jhoblitt

Message:

memory leak fixes

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (2 diffs)
• dettoolConfig.c (modified) (10 diffs)

trunk/ippTools/src/dettool.c

@@ -47 +47 @@
 int main(int argc, char **argv)
 {
+    psLibInit(NULL);
+
     pxConfig *config = dettoolConfig(NULL, argc, argv);
 
@@ -76 +78 @@
     }
 
+    psFree(config);
+    psLibFinalize();
+
     exit(EXIT_SUCCESS);
 
 FAIL:
     psFree(config);
+    psLibFinalize();
+
     exit(EXIT_FAILURE);
 }

trunk/ippTools/src/dettoolConfig.c

@@ -18 +18 @@
     if (!config->modules) {
         psError(PS_ERR_UNKNOWN, false, "Can't find site configuration");
-        exit(EXIT_FAILURE);
+        goto FAIL;
     }
 
@@ -394 +394 @@
         psFree(rerunArgs);
 
-        exit(EXIT_FAILURE);
+        goto FAIL;
     }
 
@@ -423 +423 @@
         if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\
             psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-            exit(EXIT_FAILURE); \
+            goto FAIL; \
         } \
     }
@@ -440 +440 @@
         if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "iteration", 0, "==", n)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item iteration");
-            exit(EXIT_FAILURE);
+            goto FAIL;
         }
     }
@@ -450 +450 @@
         if (!psMetadataAddStr(config->where, PS_LIST_TAIL, "camera", 0, "==", str)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item camera");
-            exit(EXIT_FAILURE);
+            goto FAIL;
         }
     }
@@ -458 +458 @@
         if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "imfiles", 0, "==", n)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles");
-            exit(EXIT_FAILURE);
+            goto FAIL;
         }
     }
@@ -467 +467 @@
         if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "p1_version", 0, "==", n)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item p1_version");
-            exit(EXIT_FAILURE);
+            goto FAIL;
         }
     }
@@ -473 +473 @@
         if (!psMetadataAddBool(config->where, PS_LIST_TAIL, "accept", 0, "==", boolean)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item accept");
-            exit(EXIT_FAILURE);
+            goto FAIL;
         }
     }
@@ -489 +489 @@
     if (!config->dbh) {
         psError(PS_ERR_UNKNOWN, false, "Can't configure database");
-        exit(EXIT_FAILURE);
+        goto FAIL;
     }
 
@@ -497 +497 @@
 
     return config;
+
+FAIL:
+    psLibFinalize();
+    exit(EXIT_FAILURE);
 }