Changeset 33460

Timestamp:

Mar 9, 2012, 11:56:26 AM (14 years ago)

Author:

eugene

Message:

free tables and close files when loading BrightCatalog

File:

• branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/BrightCatalog.c (modified) (10 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/BrightCatalog.c

@@ -26 +26 @@
   FTable ftable;
 
+  header.buffer = NULL;
+  matrix.buffer = NULL;
+  ftable.buffer = NULL;
+  theader.buffer = NULL;
   BrightCatalog *catalog = NULL;
 
@@ -31 +35 @@
   if (!f) {
     fprintf (stderr, "ERROR: cannot open image subset file %s\n", filename);
-    return NULL;
+    goto escape;
   }
 
@@ -37 +41 @@
   if (!gfits_fread_header (f, &header)) {
     if (VERBOSE) fprintf (stderr, "can't read image subset header\n");
-    fclose (f);
-    return NULL;
+    goto escape;
   }
   if (!gfits_fread_matrix (f, &matrix, &header)) {
     if (VERBOSE) fprintf (stderr, "can't read image subset matrix\n");
-    gfits_free_header (&header);
-    fclose (f);
-    return NULL;
+    goto escape;
   }
 
@@ -56 +57 @@
   { 
     // load data for this header 
-    if (!gfits_load_header (f, &theader)) return (NULL);
+    if (!gfits_load_header (f, &theader)) goto escape;
 
     // read the fits table bytes
-    if (!gfits_fread_ftable_data (f, &ftable, FALSE)) return (NULL);
+    if (!gfits_fread_ftable_data (f, &ftable, FALSE)) goto escape;
  
     // need to create and assign to flat-field correction
@@ -78 +79 @@
     GET_COLUMN(catID,     "CAT_ID",     int);
     GET_COLUMN(photcode,  "PHOTCODE",   short);
-    // XXX free the fits table data here 
+    gfits_free_header (&theader);
+    gfits_free_table  (&ftable);
 
     MeasureTiny *measure = NULL;
@@ -127 +129 @@
 
     // load data for this header 
-    if (!gfits_load_header (f, &theader)) return (NULL);
+    if (!gfits_load_header (f, &theader)) goto escape;
 
     // read the fits table bytes
-    if (!gfits_fread_ftable_data (f, &ftable, FALSE)) return (NULL);
+    if (!gfits_fread_ftable_data (f, &ftable, FALSE)) goto escape;
  
     // need to create and assign to flat-field correction
@@ -139 +141 @@
     GET_COLUMN(flags,         "FLAGS",       int);
     GET_COLUMN(catID,         "CAT_ID",      int);
-    // XXX free the fits table data here 
+    gfits_free_header (&theader);
+    gfits_free_table  (&ftable);
 
     AverageTiny *average = NULL;
@@ -168 +171 @@
 
     // load data for this header 
-    if (!gfits_load_header (f, &theader)) return (NULL);
+    if (!gfits_load_header (f, &theader)) goto escape;
 
     // read the fits table bytes
-    if (!gfits_fread_ftable_data (f, &ftable, FALSE)) return (NULL);
+    if (!gfits_fread_ftable_data (f, &ftable, FALSE)) goto escape;
  
     // need to create and assign to flat-field correction
@@ -182 +185 @@
     GET_COLUMN(M_20,  "MAG_20",   short);
     GET_COLUMN(M_80,  "MAG_80",   short);
-    // XXX free the fits table data here 
+    gfits_free_header (&theader);
+    gfits_free_table  (&ftable);
 
     SecFilt *secfilt = NULL;
@@ -210 +214 @@
   }
 
-  // close files
+  gfits_free_header (&header);
+  gfits_free_matrix (&matrix);
+  if (catalog) free (catalog);
+
+  fclose (f);
 
   return catalog;
+
+escape:
+  gfits_free_header (&header);
+  gfits_free_matrix (&matrix);
+  gfits_free_header (&theader);
+  gfits_free_table  (&ftable);
+  if (catalog) free (catalog);
+
+  fclose (f);
+  return NULL;
 }