Changeset 40112

Timestamp:

Aug 9, 2017, 12:45:01 PM (9 years ago)

Author:

eugene

Message:

some harmless changes trying to track down the dvopsps segfault (free to FREE, space changes, comments)

Location:

branches/eam_branches/ohana.20170809/src/libdvo/src

Files:

• dvo_catalog.c (modified) (5 diffs)
• dvo_catalog_split.c (modified) (4 diffs)

branches/eam_branches/ohana.20170809/src/libdvo/src/dvo_catalog.c

@@ -592 +592 @@
   }
 
-  gfits_init_header (&catalog[0].header);
+  gfits_init_header (&catalog[0].header); // *** FUNC : OK
   
   // the following describe the catalog files on disk
@@ -730 +730 @@
   }
   
-  // NOTE: this only check if we can write a backup; it does not actually write the backup
+  // NOTE: this only checks if we can write a backup; it does not actually write the backup
   if (!check_file_access (catalog[0].filename, BACKUP, READWRITE, VERBOSE)) {
     fprintf (stderr, "no permission to access %s\n", catalog[0].filename);
@@ -769 +769 @@
   
   int Naxis, split, status;
-  char measure[80];
+  char measure[256];
 
   dvo_catalog_init (catalog, FALSE);
@@ -947 +947 @@
 
     if (catalog[0].measure_catalog) {
-      free (catalog[0].measure_catalog[0].filename);
+      FREE (catalog[0].measure_catalog[0].filename);
       dvo_catalog_free (catalog[0].measure_catalog);
-      free (catalog[0].measure_catalog);
+      FREE (catalog[0].measure_catalog);
     }
     if (catalog[0].missing_catalog) {
-      free (catalog[0].missing_catalog[0].filename);
+      FREE (catalog[0].missing_catalog[0].filename);
       dvo_catalog_free (catalog[0].missing_catalog);
-      free (catalog[0].missing_catalog);
+      FREE (catalog[0].missing_catalog);
     }
     if (catalog[0].secfilt_catalog) {
-      free (catalog[0].secfilt_catalog[0].filename);
+      FREE (catalog[0].secfilt_catalog[0].filename);
       dvo_catalog_free (catalog[0].secfilt_catalog);
-      free (catalog[0].secfilt_catalog);
+      FREE (catalog[0].secfilt_catalog);
     }
     if (catalog[0].lensing_catalog) {
-      free (catalog[0].lensing_catalog[0].filename);
+      FREE (catalog[0].lensing_catalog[0].filename);
       dvo_catalog_free (catalog[0].lensing_catalog);
-      free (catalog[0].lensing_catalog);
+      FREE (catalog[0].lensing_catalog);
     }
     if (catalog[0].lensobj_catalog) {
-      free (catalog[0].lensobj_catalog[0].filename);
+      FREE (catalog[0].lensobj_catalog[0].filename);
       dvo_catalog_free (catalog[0].lensobj_catalog);
-      free (catalog[0].lensobj_catalog);
+      FREE (catalog[0].lensobj_catalog);
     }
     if (catalog[0].starpar_catalog) {
-      free (catalog[0].starpar_catalog[0].filename);
+      FREE (catalog[0].starpar_catalog[0].filename);
       dvo_catalog_free (catalog[0].starpar_catalog);
-      free (catalog[0].starpar_catalog);
+      FREE (catalog[0].starpar_catalog);
     }
     if (catalog[0].galphot_catalog) {
-      free (catalog[0].galphot_catalog[0].filename);
+      FREE (catalog[0].galphot_catalog[0].filename);
       dvo_catalog_free (catalog[0].galphot_catalog);
-      free (catalog[0].galphot_catalog);
+      FREE (catalog[0].galphot_catalog);
     }
   }
@@ -991 +991 @@
   /* free, initialize data structures */
   if (catalog[0].average) {
-    free (catalog[0].average); 
+    FREE (catalog[0].average); 
     catalog[0].Naverage = 0;
     catalog[0].average = NULL;
   }
   if (catalog[0].measure) {
-    free (catalog[0].measure); 
+    FREE (catalog[0].measure); 
     catalog[0].Nmeasure = 0;
     catalog[0].measure = NULL;
   }
   if (catalog[0].measureT) {
-    free (catalog[0].measureT); 
+    FREE (catalog[0].measureT); 
   }
   if (catalog[0].missing) {
-    free (catalog[0].missing); 
+    FREE (catalog[0].missing); 
     catalog[0].Nmissing = 0;
     catalog[0].missing = NULL;
   }
   if (catalog[0].secfilt) {
-    free (catalog[0].secfilt); 
+    FREE (catalog[0].secfilt); 
     catalog[0].Nsecfilt_mem = 0;
     catalog[0].secfilt = NULL;
   }
   if (catalog[0].lensing) {
-    free (catalog[0].lensing); 
+    FREE (catalog[0].lensing); 
     catalog[0].Nlensing = 0;
     catalog[0].lensing = NULL;
   }
   if (catalog[0].lensobj) {
-    free (catalog[0].lensobj); 
+    FREE (catalog[0].lensobj); 
     catalog[0].Nlensobj = 0;
     catalog[0].lensobj = NULL;
   }
   if (catalog[0].starpar) {
-    free (catalog[0].starpar); 
+    FREE (catalog[0].starpar); 
     catalog[0].Nstarpar = 0;
     catalog[0].starpar = NULL;
   }
   if (catalog[0].galphot) {
-    free (catalog[0].galphot); 
+    FREE (catalog[0].galphot); 
     catalog[0].Ngalphot = 0;
     catalog[0].galphot = NULL;
   }
-  if (catalog[0].nOwn_t)      { free (catalog[0].nOwn_t); catalog[0].nOwn_t = NULL; }
-  if (catalog[0].found_t)     { free (catalog[0].found_t); catalog[0].found_t = NULL; }
-  if (catalog[0].foundWarp_t) { free (catalog[0].foundWarp_t); catalog[0].foundWarp_t = NULL; }
-  if (catalog[0].measureRank) { free (catalog[0].measureRank); catalog[0].measureRank = NULL; }
+  if (catalog[0].nOwn_t)      { FREE (catalog[0].nOwn_t); catalog[0].nOwn_t = NULL; }
+  if (catalog[0].found_t)     { FREE (catalog[0].found_t); catalog[0].found_t = NULL; }
+  if (catalog[0].foundWarp_t) { FREE (catalog[0].foundWarp_t); catalog[0].foundWarp_t = NULL; }
+  if (catalog[0].measureRank) { FREE (catalog[0].measureRank); catalog[0].measureRank = NULL; }
 }
 

branches/eam_branches/ohana.20170809/src/libdvo/src/dvo_catalog_split.c

@@ -249 +249 @@
   off_t Nskip;
   int status;
-  char *path, string[256];
+  char *path, string[1024];
   Catalog *subcat;
 
@@ -267 +267 @@
     // databases created prior to ~2014.07.01 did not have the LENSING, LENSOBJ, STARPAR paths in their headers.
     // in these cases, we do not try to lock or open the relevant file
-    if (!strcmp (name, "LENSING"))  return (DVO_CAT_OPEN_EMPTY);
-    if (!strcmp (name, "LENSOBJ"))  return (DVO_CAT_OPEN_EMPTY);
-    if (!strcmp (name, "STARPAR"))  return (DVO_CAT_OPEN_EMPTY);
+    if (!strcmp (name, "LENSING")) return (DVO_CAT_OPEN_EMPTY);
+    if (!strcmp (name, "LENSOBJ")) return (DVO_CAT_OPEN_EMPTY);
+    if (!strcmp (name, "STARPAR")) return (DVO_CAT_OPEN_EMPTY);
     if (!strcmp (name, "GALPHOT")) return (DVO_CAT_OPEN_EMPTY);
     return (DVO_CAT_OPEN_FAIL);
@@ -464 +464 @@
   catalog[0].Nmissing_disk = Nmissing;
   catalog[0].Nsecfilt_disk = Naverage * Nsecfilt;
-  catalog[0].Nlensing_disk  = Nlensing;
-  catalog[0].Nlensobj_disk  = Nlensobj;
-  catalog[0].Nstarpar_disk  = Nstarpar;
+  catalog[0].Nlensing_disk = Nlensing;
+  catalog[0].Nlensobj_disk = Nlensobj;
+  catalog[0].Nstarpar_disk = Nstarpar;
   catalog[0].Ngalphot_disk = Ngalphot;
 
@@ -477 +477 @@
   catalog[0].lensobj  = NULL;
   catalog[0].starpar  = NULL;
-  catalog[0].galphot = NULL;
+  catalog[0].galphot  = NULL;
 
   /*** Average Table ***/