Changeset 28241 for trunk/Ohana/src/opihi/cmd.data

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/cmd.data/extract.c (modified) (1 diff)
• src/opihi/cmd.data/matrix.c (modified) (1 diff)
• src/opihi/cmd.data/rd.c (modified) (1 diff)
• src/opihi/cmd.data/rdseg.c (modified) (1 diff)
• src/opihi/cmd.data/rebin.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.data/extract.c

@@ -70 +70 @@
     if ((out[0].header.Naxis[1] != Ny) || (out[0].header.Naxis[0] != Nx)) {
       gprint (GP_ERR, "matrix sizes mis-matched\n");
-      gprint (GP_ERR, "%d x %d  vs  %lld x %lld\n", Nx, Ny, 
-              (long long) out[0].header.Naxis[0], (long long) out[0].header.Naxis[1]);
+      gprint (GP_ERR, "%d x %d  vs  "OFF_T_FMT" x "OFF_T_FMT"\n", Nx, Ny, 
+               out[0].header.Naxis[0],  out[0].header.Naxis[1]);
       return (FALSE);
     }

trunk/Ohana/src/opihi/cmd.data/matrix.c

@@ -23 +23 @@
 
     if (bufB[0].matrix.Naxis[0] != bufC[0].matrix.Naxis[1]) {
-      gprint (GP_ERR, "size mis-match in matrices: (%lld x %lld) * (%lld x %lld)\n", 
-              (long long) bufB[0].matrix.Naxis[0], (long long) bufB[0].matrix.Naxis[1], 
-              (long long) bufC[0].matrix.Naxis[0], (long long) bufC[0].matrix.Naxis[1]);
+      gprint (GP_ERR, "size mis-match in matrices: ("OFF_T_FMT" x "OFF_T_FMT") * ("OFF_T_FMT" x "OFF_T_FMT")\n", 
+               bufB[0].matrix.Naxis[0],  bufB[0].matrix.Naxis[1], 
+               bufC[0].matrix.Naxis[0],  bufC[0].matrix.Naxis[1]);
       return (FALSE);
     }

trunk/Ohana/src/opihi/cmd.data/rd.c

@@ -222 +222 @@
   buf[0].unsign = buf[0].header.unsign;
 
-  gprint (GP_LOG, "read %lld bytes from %s into buffer %s\n", 
-          (long long) buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
+  gprint (GP_LOG, "read "OFF_T_FMT" bytes from %s into buffer %s\n", 
+           buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
 
   blank = 0xffff;

trunk/Ohana/src/opihi/cmd.data/rdseg.c

@@ -62 +62 @@
   buf[0].bzero  = buf[0].header.bzero;     /* store the original values */
   buf[0].unsign = buf[0].header.unsign;
-  gprint (GP_LOG, "read %lld bytes from %s into buffer %s\n", (long long) buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
+  gprint (GP_LOG, "read "OFF_T_FMT" bytes from %s into buffer %s\n",  buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
 
   gfits_scan (&buf[0].header, "BLANK", "%d", 1, &blank);

trunk/Ohana/src/opihi/cmd.data/rebin.c

@@ -63 +63 @@
     }      
   }
-  if (VERBOSE) gprint (GP_LOG, "rebin %s to %s (%lld,%lld to %d,%d)\n", argv[1], argv[2], (long long) in[0].header.Naxis[0], (long long) in[0].header.Naxis[1], nx, ny);
+  if (VERBOSE) gprint (GP_LOG, "rebin %s to %s ("OFF_T_FMT","OFF_T_FMT" to %d,%d)\n", argv[1], argv[2],  in[0].header.Naxis[0],  in[0].header.Naxis[1], nx, ny);
 
   Nx = in[0].header.Naxis[0];