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_define_column.c

    r38441 r38553  
    1111  off_t Naxis1;
    1212  int Nfields, Nbytes, Nval;
    13   char type[16], field[16];
     13  char type[64], field[64];
    1414 
    1515  if (!gfits_bintable_format (format, type, &Nval, &Nbytes)) return (FALSE);
    … …  
    2121  Naxis1 += Nbytes*Nval;
    2222
    23   sprintf (field, "TTYPE%d", Nfields);
     23  snprintf (field, 64, "TTYPE%d", Nfields);
    2424  gfits_modify (header, field, "%s", 1, label);
    2525  gfits_modify_alt (header, field, "%C", 1, comment);
    26   sprintf (field, "TUNIT%d", Nfields);
     26  snprintf (field, 64, "TUNIT%d", Nfields);
    2727  gfits_modify (header, field, "%s", 1, unit);
    28   sprintf (field, "TFORM%d", Nfields);
     28  snprintf (field, 64, "TFORM%d", Nfields);
    2929  gfits_modify (header, field, "%s", 1, format);
    3030
    3131  // add scaling parameters unless they amount to a noop
    3232  if ((bscale != 1.0) || (bzero != 0.0)) {
    33       sprintf (field, "TSCAL%d", Nfields);
     33      snprintf (field, 64, "TSCAL%d", Nfields);
    3434      gfits_modify (header, field, "%lf", 1, bscale);
    35       sprintf (field, "TZERO%d", Nfields);
     35      snprintf (field, 64, "TZERO%d", Nfields);
    3636      gfits_modify (header, field, "%lf", 1, bzero);
    3737  }
    … …  
    5454  off_t Naxis1;
    5555  int Nfields, Nbytes, Nval;
    56   char type[16], field[16];
     56  char type[64], field[64];
    5757 
    5858  if (!gfits_bintable_format (format, type, &Nval, &Nbytes)) return (FALSE);
    … …  
    6464  Naxis1 += Nbytes*Nval;
    6565
    66   sprintf (field, "TTYPE%d", Nfields);
     66  snprintf (field, 64, "TTYPE%d", Nfields);
    6767  gfits_modify (header, field, "%s", 1, label);
    6868  if (comment) {
    … …  
    7070  }
    7171  if (unit) {
    72     sprintf (field, "TUNIT%d", Nfields);
     72    snprintf (field, 64, "TUNIT%d", Nfields);
    7373    gfits_modify (header, field, "%s", 1, unit);
    7474  }
    75   sprintf (field, "TFORM%d", Nfields);
     75  snprintf (field, 64, "TFORM%d", Nfields);
    7676  gfits_modify (header, field, "%s", 1, format);
    7777
    7878  // add scaling parameters unless they amount to a noop
    7979  if ((bscale != 1.0) || (bzero != 0.0)) {
    80       sprintf (field, "TSCAL%d", Nfields);
     80      snprintf (field, 64, "TSCAL%d", Nfields);
    8181      gfits_modify (header, field, "%lf", 1, bscale);
    82       sprintf (field, "TZERO%d", Nfields);
     82      snprintf (field, 64, "TZERO%d", Nfields);
    8383      gfits_modify (header, field, "%lf", 1, bzero);
    8484  }
    … …  
    9797  off_t Naxis1;
    9898  int Nstart, Nfields, Nbytes, Nval;
    99   char type[16], field[16], cformat[16];
     99  char type[64], field[64], cformat[64];
    100100
    101101  strcpy (cformat, format);
    … …  
    109109  Naxis1 += Nbytes*Nval;
    110110
    111   sprintf (field, "TTYPE%d", Nfields);
     111  snprintf (field, 64, "TTYPE%d", Nfields);
    112112  gfits_modify (header, field, "%s", 1, label);
    113113  gfits_modify_alt (header, field, "%C", 1, comment);
    114   sprintf (field, "TUNIT%d", Nfields);
     114  snprintf (field, 64, "TUNIT%d", Nfields);
    115115  gfits_modify (header, field, "%s", 1, unit);
    116   sprintf (field, "TFORM%d", Nfields);
     116  snprintf (field, 64, "TFORM%d", Nfields);
    117117  gfits_modify (header, field, "%s", 1, format);
    118118
    119   sprintf (field, "TBCOL%d", Nfields);
     119  snprintf (field, 64, "TBCOL%d", Nfields);
    120120  gfits_modify (header, field, "%d", 1, Nstart);
    121121
Note: See TracChangeset for help on using the changeset viewer.