Changeset 6379 for trunk/psphot/src/psphotChoosePSF.c

Timestamp:

Feb 7, 2006, 8:52:03 PM (20 years ago)

Author:

eugene

Message:

extensive cleanup of memory handling : no more leaks!

File:

• trunk/psphot/src/psphotChoosePSF.c (modified) (5 diffs)

trunk/psphot/src/psphotChoosePSF.c

@@ -1 +1 @@
 # include "psphot.h"
 
+// 2006.02.07 : no leaks!
 // try PSF models and select best option
 pmPSF *psphotChoosePSF (psMetadata *config, psArray *sources, psStats *skystats) { 
@@ -8 +9 @@
     pmPSFtry       *try   = NULL;
     psArray        *stars = NULL;
-    psMetadataItem *item  = NULL;
 
     psTimerStart ("psphot");
@@ -37 +37 @@
     psMetadataItem *mdi = psMetadataLookup (config, "PSF_MODEL");
     if (mdi == NULL) psAbort ("psphotChoosePSF", "missing PSF_MODEL selection");
+
     if (mdi->type == PS_DATA_STRING) {
         list = psListAlloc(NULL);
@@ -51 +52 @@
     psListIterator *iter = psListIteratorAlloc (list, PS_LIST_HEAD, FALSE); 
     for (int i = 0; i < models->n; i++) { 
-
-        item = psListGetAndIncrement (iter);
+        // XXX psListGetAndIncrement does not increment ref counter!?
+        // XXX if it did, i should free 'item' below
+        psMetadataItem *item = psListGetAndIncrement (iter);
         modelName = item->data.V;
-
         models->data[i] = pmPSFtryModel (stars, modelName, RADIUS);
-        psFree (modelName);
-        psFree (item);
+        // psFree (item);
     }
     psFree (iter);
@@ -98 +98 @@
     psLogMsg ("psphot.pspsf", 3, "selected psf model %s, ApResid: %f +/- %f\n", modelName, psf->ApResid, psf->dApResid);
 
-    char *breakPt = psMetadataLookupPtr (&status, config, "BREAK_POINT");
+    char *breakPt = psMetadataLookupStr (&status, config, "BREAK_POINT");
     if (!strcasecmp (breakPt, "PSFFIT")) exit (0);