Changeset 5945 for trunk/Ohana/src/libdvo

Timestamp:

Jan 6, 2006, 6:45:40 PM (21 years ago)

Author:

eugene

Message:

moved filename out of SkyRegion into SkyList, SkyTable

Location:

trunk/Ohana/src/libdvo

Files:

• include/dvo.h (modified) (2 diffs)
• src/skyregion_gsc.c (modified) (6 diffs)
• src/skyregion_io.c (modified) (3 diffs)
• src/skyregion_ops.c (modified) (2 diffs)

trunk/Ohana/src/libdvo/include/dvo.h

@@ -109 +109 @@
 typedef struct {
   int Nregions;
+  char **filename;
   SkyRegion *regions;
 } SkyTable;
@@ -114 +115 @@
 typedef struct {
   int Nregions;
+  char **filename;
   SkyRegion **regions;
 } SkyList;

trunk/Ohana/src/libdvo/src/skyregion_gsc.c

@@ -59 +59 @@
   regions[Nr].child     =  TRUE;
   regions[Nr].table     =  (depth == 0);
-  regions[Nr].filename  =  (e_void) NULL;
   strcpy (regions[Nr].name, "fullsky");
   
@@ -79 +78 @@
     regions[Nr].child     =  TRUE;
     regions[Nr].table     =  (depth == 1);
-    regions[Nr].filename  =  (e_void) NULL;
     strcpy (regions[Nr].name, DecNames[i]);
   }
@@ -93 +91 @@
     regions[Nr].child     =  TRUE;
     regions[Nr].table     =  (depth == 1);
-    regions[Nr].filename  =  (e_void) NULL;
     strcpy (regions[Nr].name, DecNames[i+13]);
   }
@@ -141 +138 @@
       regions[Nr].child    =  TRUE;
       regions[Nr].table    =  (depth == 2);
-      regions[Nr].filename =  (e_void) NULL;
       regions[Nr].childS   =  0;
       regions[Nr].childE   =  0;
@@ -179 +175 @@
         regions[Nr].child    =  FALSE;
         regions[Nr].table    =  (depth == 3);
-        regions[Nr].filename =  (e_void) NULL;
         regions[Nr].childS   =  0;
         regions[Nr].childE   =  0;
@@ -198 +193 @@
   skytable[0].regions = regions;
   skytable[0].Nregions = Nr;
+
+  ALLOCATE (skytable[0].filename, char *, skytable[0].Nregions);
+  for (i = 0; i < skytable[0].Nregions; i++) {
+    skytable[0].filename[i] = NULL;
+  }
+
   return (skytable);
 }

trunk/Ohana/src/libdvo/src/skyregion_io.c

@@ -40 +40 @@
   ALLOCATE (skytable, SkyTable, 1);
   skytable[0].regions = fits_table_get_SkyRegion (&ftable, &skytable[0].Nregions, NULL);
+  ALLOCATE (skytable[0].filename, char *, skytable[0].Nregions);
   for (i = 0; i < skytable[0].Nregions; i++) {
-    skytable[0].regions[i].filename = (e_void) NULL;
+    skytable[0].filename[i] = NULL;
   }
   
@@ -146 +147 @@
   for (i = 0; i < list[0].Nregions; i++) {
     sprintf (line, "%s/%s.%s", path, list[0].regions[i][0].name, ext);
-    list[0].regions[i][0].filename = (e_void) strcreate (line);
+    list[0].filename[i] = strcreate (line);
   }
 
@@ -160 +161 @@
   for (i = 0; i < sky[0].Nregions; i++) {
     sprintf (line, "%s/%s.%s", path, sky[0].regions[i].name, ext);
-    sky[0].regions[i].filename = (e_void) strcreate (line);
+    sky[0].filename[i] = strcreate (line);
   }
 

trunk/Ohana/src/libdvo/src/skyregion_ops.c

@@ -272 +272 @@
     if (ELEMENTS) {
       for (i = 0; i < list[0].Nregions; i++) {
-        if (list[0].regions[i][0].filename != (e_void) NULL) {
-          free ((size_t *) list[0].regions[i][0].filename);
+        if (list[0].filename[i] != NULL) {
+          free (list[0].filename[i]);
         }
         free (list[0].regions[i]);
@@ -292 +292 @@
   if (table[0].regions != NULL) {
     for (i = 0; i < table[0].Nregions; i++) {
-      if (table[0].regions[i].filename != (e_void) NULL) {
-        free ((size_t *) table[0].regions[i].filename);
+      if (table[0].filename[i] != NULL) {
+        free (table[0].filename[i]);
       }
     }