Changeset 28241 for trunk/Ohana/src/libfits/table/F_define_column.c

Timestamp:

Jun 6, 2010, 4:06:31 PM (16 years ago)

Author:

eugene

Message:

merging changes from branches/eam_branches/Ohana.20100606: re-work the off_t print/scan format; fix and test NAN implementation in gnu89 context; fix and test BYTE_SWAP for libohana

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/table/F_define_column.c (modified) (4 diffs)

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

@@ -13 +13 @@
   Nfields = 0;
   gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
-  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Naxis1);
+  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1,  &Naxis1);
   Nfields ++;
   Naxis1 += Nbytes*Nval;
@@ -35 +35 @@
   /* update TFIELDS & NAXIS1 */
   gfits_modify (header, "TFIELDS", "%d", 1, Nfields);
-  gfits_modify (header, "NAXIS1",  "%lld", 1, (long long) Naxis1);
+  gfits_modify (header, "NAXIS1",  OFF_T_FMT, 1,  Naxis1);
   header[0].Naxis[0] = Naxis1;
 
@@ -53 +53 @@
   Nfields = 0;
   gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
-  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Naxis1);
+  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1,  &Naxis1);
   Nstart = Naxis1 + 1;
   Nfields ++;
@@ -70 +70 @@
 
   gfits_modify (header, "TFIELDS", "%d", 1, Nfields);
-  gfits_modify (header, "NAXIS1",  "%lld", 1, (long long) Naxis1);
+  gfits_modify (header, "NAXIS1",  OFF_T_FMT, 1,  Naxis1);
   header[0].Naxis[0] = Naxis1;