Changeset 26117 for trunk/ppStack/src/ppStackCleanup.c

Timestamp:

Nov 12, 2009, 4:38:34 PM (16 years ago)

Author:

Paul Price

Message:

Fix SEGV from doing cleanup in wrong place. Moved deletion of temporary files to ppStackFinish().

File:

• trunk/ppStack/src/ppStackCleanup.c (modified) (3 diffs)

trunk/ppStack/src/ppStackCleanup.c

@@ -4 +4 @@
 
 #include <stdio.h>
-#include <unistd.h>
 #include <pslib.h>
 #include <psmodules.h>
@@ -22 +21 @@
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // ppStack recipe
     psAssert(recipe, "We've thrown an error on this before.");
-
-    bool mdok;                          // Status of MD lookup
-    bool tempDelete = psMetadataLookupBool(&mdok, recipe, "TEMP.DELETE"); // Delete temporary files?
 
 #if 0
@@ -72 +68 @@
             }
         }
-
-        if (tempDelete) {
-            psString imageResolved = pmConfigConvertFilename(options->convImages->data[i],
-                                                             config, false, false);
-            psString maskResolved = pmConfigConvertFilename(options->convMasks->data[i],
-                                                            config, false, false);
-            psString varianceResolved = pmConfigConvertFilename(options->convVariances->data[i],
-                                                                config, false, false);
-            if (unlink(imageResolved) == -1 || unlink(maskResolved) == -1 ||
-                unlink(varianceResolved) == -1) {
-                psWarning("Unable to delete temporary files for image %d", i);
-            }
-            psFree(imageResolved);
-            psFree(maskResolved);
-            psFree(varianceResolved);
-        }
     }