Changeset 38553 for trunk/Ohana/src/libfits/table/F_get_column.c

Timestamp:

Jun 25, 2015, 10:41:05 PM (11 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/ipp-20150616

File:

• trunk/Ohana/src/libfits/table/F_get_column.c (modified) (16 diffs)

trunk/Ohana/src/libfits/table/F_get_column.c

@@ -25 +25 @@
   off_t Nx, Ny;
   int i, N, Nfields, Nval, Nbytes, Nstart, Nv, Nb;
-  char tlabel[80], field[80], format[80], tmpline[16];
+  char tlabel[256], field[256], format[256], tmpline[64];
   char *Pin, *Pout, *array;
   double Bscale, Bzero;
@@ -36 +36 @@
   if (!gfits_scan (header, "TFIELDS", "%d", 1, &Nfields)) return (NULL);
   for (i = 1; strcasecmp (label, tlabel) && (i < Nfields + 1); i++) {
-    sprintf (field, "TTYPE%d", i);
+    snprintf (field, 256, "TTYPE%d", i);
     gfits_scan (header, field, "%s", 1, tlabel);
   }
@@ -46 +46 @@
 
   /* interpret format */
-  sprintf (field, "TSCAL%d", N);
+  snprintf (field, 256, "TSCAL%d", N);
   gfits_scan (header, field, "%lf", 1, &Bscale);
-  sprintf (field, "TZERO%d", N);
+  snprintf (field, 256, "TZERO%d", N);
   gfits_scan (header, field, "%lf", 1, &Bzero);
-  sprintf (field, "TFORM%d", N);
+  snprintf (field, 256, "TFORM%d", N);
   gfits_scan (header, field, "%s", 1, format);
 
@@ -62 +62 @@
   Nstart = 0;
   for (i = 1; i < N; i++) {
-    sprintf (field, "TFORM%d", i);
+    snprintf (field, 256, "TFORM%d", i);
     gfits_scan (header, field, "%s", 1, format);
     gfits_bintable_format (format, tmpline, &Nv, &Nb);
@@ -145 +145 @@
 
   int Nbytes;
-  char field[80], format[80];
+  char field[256], format[256];
 
   assert (N > 0);
 
-  sprintf (field, "TFORM%d", N);
+  snprintf (field, 256, "TFORM%d", N);
   if (!gfits_scan (header, field, "%s", 1, format)) return FALSE;
   if (!gfits_bintable_format (format, type, Nval, &Nbytes)) return (FALSE);
@@ -159 +159 @@
 
   int i, N, Nfields;
-  char tlabel[80], field[80];
+  char tlabel[256], field[256];
 
   if (label == (char *) NULL) return (FALSE);
@@ -168 +168 @@
   gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
   for (i = 1; strcasecmp (label, tlabel) && (i < Nfields + 1); i++) {
-    sprintf (field, "TTYPE%d", i);
+    snprintf (field, 256, "TTYPE%d", i);
     gfits_scan (header, field, "%s", 1, tlabel);
   }
@@ -181 +181 @@
 int gfits_get_bintable_column_raw (Header *header, FTable *table, char *label, void **data, char nativeOrder) {
 
-  char type[16];
+  char type[64];
   off_t Nrow;
   int Ncol;
@@ -195 +195 @@
 int gfits_get_bintable_column (Header *header, FTable *table, char *label, void **data) {
 
-  char type[16];
+  char type[64];
   off_t Nrow;
   int Ncol;
@@ -229 +229 @@
 
   int i, N, Nfields, Nval, Nbytes;
-  char tlabel[80], field[80], format[80];
+  char tlabel[256], field[256], format[256];
 
   if (label == (char *) NULL) return (FALSE);
@@ -238 +238 @@
   gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
   for (i = 1; strcasecmp (label, tlabel) && (i < Nfields + 1); i++) {
-    sprintf (field, "TTYPE%d", i);
+    snprintf (field, 256, "TTYPE%d", i);
     gfits_scan (header, field, "%s", 1, tlabel);
   }
@@ -245 +245 @@
 
   /* interpret format */
-  sprintf (field, "TFORM%d", N);
+  snprintf (field, 256, "TFORM%d", N);
   gfits_scan (header, field, "%s", 1, format);
 
@@ -257 +257 @@
   off_t Nx, Ny;
   int i, N, Nfields, Nval, Nbytes, Nstart, Nv, Nb;
-  char tlabel[80], field[80], format[80], cformat[80], type[16], tmp[16];
+  char tlabel[256], field[256], format[256], cformat[256], type[64], tmp[64];
   char *array, *Pin, *Pout, *line;
 
@@ -268 +268 @@
   gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
   for (i = 1; strcasecmp (label, tlabel) && (i < Nfields + 1); i++) {
-    sprintf (field, "TTYPE%d", i);
+    snprintf (field, 256, "TTYPE%d", i);
     gfits_scan (header, field, "%s", 1, tlabel);
   }
@@ -275 +275 @@
 
   /* interpret format */
-  sprintf (field, "TFORM%d", N);
+  snprintf (field, 256, "TFORM%d", N);
   gfits_scan (header, field, "%s", 1, format);
 
@@ -288 +288 @@
   Nstart = 0;
   for (i = 1; i < N; i++) {
-    sprintf (field, "TFORM%d", i);
+    snprintf (field, 256, "TFORM%d", i);
     gfits_scan (header, field, "%s", 1, format);
     gfits_table_format (format, tmp, &Nv, &Nb);