Changeset 19259

Timestamp:

Aug 28, 2008, 10:00:24 AM (18 years ago)

Author:

eugene

Message:

extend 64 byte name limit to 128

Location:

trunk/Ohana/src

Files:

• addstar/src/LoadData.c (modified) (2 diffs)
• addstar/src/LoadDataPMM.c (modified) (2 diffs)
• addstar/src/ReadStarsSDSS.c (modified) (2 diffs)
• addstar/src/sky_tessalation.c (modified) (4 diffs)
• getstar/src/ReadImageFiles.c (modified) (3 diffs)

trunk/Ohana/src/addstar/src/LoadData.c

@@ -1 +1 @@
 # include "addstar.h"
+# define DVO_IMAGE_NAME_LEN 128
 
 // XXX this function is somewhat specific to the elixir format output files 
@@ -43 +44 @@
     // XXX use something to set the chip name? EXTNAME?
     if (!strcmp(headerSets[i].exthead, "PHU") && (Nimages == 1)) {
-      snprintf (images[0][Nvalid].name, 64, "%s", name);
+      snprintf (images[0][Nvalid].name, DVO_IMAGE_NAME_LEN, "%s", name);
     } else {
-      snprintf (images[0][Nvalid].name, 64, "%s[%s]", name, headerSets[i].exthead);
+      snprintf (images[0][Nvalid].name, DVO_IMAGE_NAME_LEN, "%s[%s]", name, headerSets[i].exthead);
     }
 

trunk/Ohana/src/addstar/src/LoadDataPMM.c

@@ -1 +1 @@
 # include "addstar.h"
+# define DVO_IMAGE_NAME_LEN 128
 
 /* .asc files look like:
@@ -246 +247 @@
 
     // save the filename
-    snprintf (image[0].name, 64, "%s", datafile);
+    snprintf (image[0].name, DVO_IMAGE_NAME_LEN, "%s", datafile);
     return photcode;
   }

trunk/Ohana/src/addstar/src/ReadStarsSDSS.c

@@ -1 +1 @@
 # include "addstar.h"
+# define DVO_IMAGE_NAME_LEN 128
 int SetSDSSFlags (Stars *star, unsigned int flags1, unsigned int flags2);
 
@@ -260 +261 @@
 
     // save the filename
-    snprintf (images[N].name, 64, "%s[%s]", name, filtname[i]);
+    snprintf (images[N].name, DVO_IMAGE_NAME_LEN, "%s[%s]", name, filtname[i]);
   }
 

trunk/Ohana/src/addstar/src/sky_tessalation.c

@@ -2 +2 @@
 # include "assert.h"
 # define iSWAP(X,Y) {int tmp=(X); (X) = (Y); (Y) = tmp;}
+# define DVO_IMAGE_NAME_LEN 128
 
 // we use a static refcoords structure to avoid multiple alloc / init steps
@@ -77 +78 @@
     for (j = 0; j < Ntriangles; j++) {
       sky_triangle_to_image (&image[j], &tri[j]);
-      snprintf (image[j].name, 64, format, Nout);
+      snprintf (image[j].name, DVO_IMAGE_NAME_LEN, format, Nout);
       Nout++;
     }  
@@ -160 +161 @@
       if (!strcmp(rectangle[j].coords.ctype, "DROP")) continue;
       memcpy (&subset[Nsubset], &rectangle[j], sizeof(SkyRectangle));
-      snprintf (subset[Nsubset].name, 64, format, Nname);
+      snprintf (subset[Nsubset].name, DVO_IMAGE_NAME_LEN, format, Nname);
       Nname++;
       Nsubset++;
@@ -427 +428 @@
       memcpy (&output[N].coords, &input[0].coords, sizeof(Coords));
 
-      snprintf (output[N].name, 64, format, N);
+      snprintf (output[N].name, DVO_IMAGE_NAME_LEN, format, N);
       output[N].NX = NX;
       output[N].NY = NY;

trunk/Ohana/src/getstar/src/ReadImageFiles.c

@@ -1 +1 @@
 # include "dvoImageOverlaps.h"
+# define DVO_IMAGE_NAME_LEN 128
 
 Image *ReadImageFiles (char *filename, int *Nimages) {
@@ -63 +64 @@
       /* find image rootname */
       name = filebasename (file[i]);
-      snprintf (image[N].name, 64, name);
+      snprintf (image[N].name, DVO_IMAGE_NAME_LEN, name);
       free (name);
 
@@ -195 +196 @@
       // XXX use something to set the chip name? EXTNAME?
       if (!strcmp(exthead[i], "PHU") && (Nimage == 1)) {
-        snprintf (image[N].name, 64, "%s", name);
+        snprintf (image[N].name, DVO_IMAGE_NAME_LEN, "%s", name);
       } else {
-        snprintf (image[N].name, 64, "%s[%s]", name, exthead[i]);
+        snprintf (image[N].name, DVO_IMAGE_NAME_LEN, "%s[%s]", name, exthead[i]);
       }