Changeset 8001

Timestamp:

Jul 27, 2006, 4:50:26 PM (20 years ago)

Author:

eugene

Message:

better handling for free_catalog

Location:

trunk/Ohana/src

Files:

• addstar/src/wcatalog.c (modified) (1 diff)
• libdvo/src/dvo_catalog.c (modified) (1 diff)

trunk/Ohana/src/addstar/src/wcatalog.c

@@ -26 +26 @@
 
   /* free, initialize data structures */
-  if (catalog[0].Naverage) {
+  if (catalog[0].average != NULL) {
     free (catalog[0].average); 
     catalog[0].Naverage = 0;
   }
-  if (catalog[0].Nmeasure) {
+  if (catalog[0].measure != NULL) {
     free (catalog[0].measure); 
     catalog[0].Nmeasure = 0;
   }
-  if (catalog[0].Nmissing) {
+  if (catalog[0].missing != NULL) {
     free (catalog[0].missing); 
     catalog[0].Nmissing = 0;
   }
-  if (catalog[0].Nsecfilt) {
+  if (catalog[0].secfilt != NULL) {
     free (catalog[0].secfilt); 
     catalog[0].Nsecfilt = 0;

trunk/Ohana/src/libdvo/src/dvo_catalog.c

@@ -59 +59 @@
   if (Naxis == 2) catalog[0].catmode = DVO_MODE_RAW;
   /* don't use Naxis == 2 and split mode! */
+
+  catalog[0].average = NULL;
+  catalog[0].secfilt = NULL;
+  catalog[0].measure = NULL;
+  catalog[0].missing = NULL;
 
   switch (catalog[0].catmode) {