IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 25, 2015, 10:41:05 PM (11 years ago)
Author:
eugene
Message:

merge changes from branches/eam_branches/ipp-20150616

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/libfits/table/F_table_format.c

    r38441 r38553  
    113113  if (!*Nbytes) { return (FALSE); }
    114114 
     115  // XXXX : check usage:
     116  myAbort ("need to check length");
    115117  sprintf (format, "%%-%s%c", Size, Type);
    116118
    … …  
    191193  off_t Nx, off;
    192194  int i, Nchar, Nval, Nbytes, Nfields;
    193   char *line, format[64], field[16], type[16];
     195  char *line, format[64], field[64], type[64];
    194196  va_list argp;
    195197 
    … …  
    204206  for (i = 1; i <= Nfields; i++) {
    205207
    206     sprintf (field, "TFORM%d", i);
     208    snprintf (field, 64, "TFORM%d", i);
    207209    gfits_scan (table[0].header, field, "%s", 1, format);       /* get field format */
    208210    gfits_table_format (format, type, &Nval, &Nbytes); /* convert to c-style */
    … …  
    232234  int i, j, n, Nfields;
    233235  int Nchar, Nval, Nbytes, status;
    234   char format[64], field[16], type[16];
     236  char format[64], field[64], type[64];
    235237  double tzero, tscale;
    236238  char *tmpChar;
    … …  
    246248
    247249  for (i = 1; i <= Nfields; i++) {
    248     sprintf (field, "TFORM%d", i);
     250    snprintf (field, 64, "TFORM%d", i);
    249251    gfits_scan (ftable[0].header, field, "%s", 1, format);       /* get field format */
    250252    gfits_bintable_format (format, type, &Nval, &Nbytes); /* convert to c-style */
    251253    Nchar = Nval * Nbytes;
    252254
    253     sprintf (field, "TZERO%d", i);
     255    snprintf (field, 64, "TZERO%d", i);
    254256    status = gfits_scan (ftable[0].header, field, "%lf", 1, &tzero);       /* get field format */
    255257    if (!status) {
    … …  
    258260    }
    259261
    260     sprintf (field, "TSCAL%d", i);
     262    snprintf (field, 64, "TSCAL%d", i);
    261263    status = gfits_scan (ftable[0].header, field, "%lf", 1, &tscale);       /* get field format */
    262264    if (!status) {
    … …  
    325327  int i, j, n, Nfields;
    326328  int Nchar, Nval, Nbytes, status;
    327   char format[64], field[16], type[16];
     329  char format[64], field[64], type[64];
    328330  double tzero, tscale;
    329331  char *tmpChar;
    … …  
    339341
    340342  for (i = 1; i <= Nfields; i++) {
    341     sprintf (field, "TFORM%d", i);
     343    snprintf (field, 64, "TFORM%d", i);
    342344    gfits_scan (ftable[0].header, field, "%s", 1, format);       /* get field format */
    343345    gfits_bintable_format (format, type, &Nval, &Nbytes); /* convert to c-style */
    344346    Nchar = Nval * Nbytes;
    345347
    346     sprintf (field, "TZERO%d", i);
     348    snprintf (field, 64, "TZERO%d", i);
    347349    status = gfits_scan (ftable[0].header, field, "%lf", 1, &tzero);       /* get field format */
    348350    if (!status) {
    … …  
    351353    }
    352354
    353     sprintf (field, "TSCAL%d", i);
     355    snprintf (field, 64, "TSCAL%d", i);
    354356    status = gfits_scan (ftable[0].header, field, "%lf", 1, &tscale);       /* get field format */
    355357    if (!status) {
Note: See TracChangeset for help on using the changeset viewer.