Changeset 38553 for trunk/Ohana/src/libfits/table/F_set_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_set_column.c (modified) (12 diffs)

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

@@ -30 +30 @@
   int i, N, Nfields;
   int Nval, Nbytes, Nstart, Nv, Nb;
-  char tlabel[80], field[80], format[80], type[16], tmpline[16];
+  char tlabel[256], field[256], format[256], type[64], tmpline[64];
   char *Pin, *Pout, *array;
   double Bscale, Bzero;
@@ -41 +41 @@
   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);
   }
@@ -48 +48 @@
 
   /* interpret format */
-  sprintf (field, "TSCAL%d", N);
+  snprintf (field, 256, "TSCAL%d", N);
   if (!gfits_scan (header, field, "%lf", 1, &Bscale)) {
     Bscale = 1.0;
   }
-  sprintf (field, "TZERO%d", N);
+  snprintf (field, 256, "TZERO%d", N);
   if (!gfits_scan (header, field, "%lf", 1, &Bzero)) {
     Bzero = 0.0;
   }
-  sprintf (field, "TFORM%d", N);
+  snprintf (field, 256, "TFORM%d", N);
   gfits_scan (header, field, "%s", 1, format);
 
@@ -75 +75 @@
   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);
@@ -190 +190 @@
   int i, N, Nfields;
   int Nval, NbytesOut, Nstart, Nv, Nb;
-  char tlabel[80], field[80], format[80], outtype[16], tmpline[16];
+  char tlabel[256], field[256], format[256], outtype[64], tmpline[64];
   char *Pin, *Pout, *array;
   double Bscale, Bzero;
@@ -201 +201 @@
   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);
   }
@@ -208 +208 @@
 
   /* interpret format */
-  sprintf (field, "TSCAL%d", N);
+  snprintf (field, 256, "TSCAL%d", N);
   if (!gfits_scan (header, field, "%lf", 1, &Bscale)) {
     Bscale = 1.0;
   }
-  sprintf (field, "TZERO%d", N);
+  snprintf (field, 256, "TZERO%d", N);
   if (!gfits_scan (header, field, "%lf", 1, &Bzero)) {
     Bzero = 0.0;
   }
-  sprintf (field, "TFORM%d", N);
+  snprintf (field, 256, "TFORM%d", N);
   gfits_scan (header, field, "%s", 1, format);
 
@@ -233 +233 @@
   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);
@@ -780 +780 @@
   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;
 
@@ -790 +790 @@
   gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
   for (i = 1; strcmp (label, tlabel) && (i < Nfields + 1); i++) {
-    sprintf (field, "TTYPE%d", i);
+    snprintf (field, 256, "TTYPE%d", i);
     gfits_scan (header, field, "%s", 1, tlabel);
   }
@@ -797 +797 @@
 
   /* interpret format */
-  sprintf (field, "TFORM%d", N);
+  snprintf (field, 256, "TFORM%d", N);
   gfits_scan (header, field, "%s", 1, format);
 
@@ -815 +815 @@
   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);