Changeset 5945 for trunk/Ohana/src/opihi/dvo/region_list.c

Timestamp:

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

Author:

eugene

Message:

moved filename out of SkyRegion into SkyList, SkyTable

File:

• trunk/Ohana/src/opihi/dvo/region_list.c (modified) (3 diffs)

trunk/Ohana/src/opihi/dvo/region_list.c

@@ -96 +96 @@
     ALLOCATE (skylist[0].regions, SkyRegion *, 1);
     ALLOCATE (skylist[0].regions[0], SkyRegion, 1);
+    ALLOCATE (skylist[0].filename, char *, 1);
+    
     strcpy (skylist[0].regions[0][0].name, RegionName);
     sprintf (filename, "%s/%s.cpt", CATDIR, RegionName);
-    skylist[0].regions[0][0].filename = (e_void) strcreate (filename);
+    skylist[0].filename[0] = strcreate (filename);
     free (RegionName);
     RegionName = NULL;
@@ -142 +144 @@
   NREGIONS = 50;
   ALLOCATE (skylist[0].regions, SkyRegion *, NREGIONS);
+  ALLOCATE (skylist[0].filename, char *, NREGIONS);
 
   while (fscanf (f, "%s", filename) != EOF) {
@@ -147 +150 @@
     strcpy (skylist[0].regions[Nregions][0].name, filename);
     sprintf (filename, "%s/%s.cpt", CATDIR, skylist[0].regions[Nregions][0].name);
-    skylist[0].regions[Nregions][0].filename = (e_void) strcreate (filename);
+    skylist[0].filename[Nregions] = strcreate (filename);
     Nregions ++;
     CHECK_REALLOCATE (skylist[0].regions, SkyRegion *, NREGIONS, Nregions, 50);