Changeset 28241 for trunk/Ohana/src/opihi/dvo/detrend.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/opihi/dvo/detrend.c (modified) (2 diffs)

trunk/Ohana/src/opihi/dvo/detrend.c

@@ -137 +137 @@
 
   /* load existing data from database */
-  gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
+  gfits_scan (&header, "NIMAGES", OFF_T_FMT, 1,  &Nimage);
   ALLOCATE (pimage, RegImage, Nimage);
   status = fread (pimage, sizeof(RegImage), Nimage, f);
@@ -143 +143 @@
 
   if (status != Nimage) {
-    gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status);
+    gprint (GP_ERR, "ERROR: header and data in dB don't match ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nimage,  status);
     gfits_free_header (&header);
     free (pimage);