Changeset 27435 for trunk/Ohana/src/opihi/lib.shell/BufferOps.c

Timestamp:

Mar 24, 2010, 11:22:25 AM (16 years ago)

Author:

eugene

Message:

large update merging in changes for Ohana to support large files

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/lib.shell/BufferOps.c (modified) (3 diffs)

trunk/Ohana/src/opihi/lib.shell/BufferOps.c

@@ -83 +83 @@
   return (buffers[i]);
 
- error:
+error:
   if (verbose) gprint (GP_ERR, "invalid matrix %s\n", name);
   return (NULL);
@@ -238 +238 @@
     gprint (GP_LOG, "    N       name                      file     X     Y    bytes BP  U   bzero     bscale  \n");
     for (i = 0; i < Nbuffers; i++) {
-      gprint (GP_LOG, "%5d %10s %25s %5d %5d %10d %3d %1d %10.4e %10.4e\n",
-               i, buffers[i][0].name, buffers[i][0].file, 
-               buffers[i][0].header.Naxis[0], buffers[i][0].header.Naxis[1],
-               buffers[i][0].header.size + buffers[i][0].matrix.size, buffers[i][0].bitpix, 
-               buffers[i][0].unsign, buffers[i][0].bzero, buffers[i][0].bscale);
+      gprint (GP_LOG, "%5d %10s %25s %5lld %5lld %10lld %3d %1d %10.4e %10.4e\n",
+              i, buffers[i][0].name, buffers[i][0].file, 
+              (long long) buffers[i][0].header.Naxis[0], (long long) buffers[i][0].header.Naxis[1],
+              (long long) buffers[i][0].header.datasize + buffers[i][0].matrix.datasize, buffers[i][0].bitpix, 
+              buffers[i][0].unsign, buffers[i][0].bzero, buffers[i][0].bscale);
     }
     return (TRUE);
@@ -249 +249 @@
   gprint (GP_LOG, "    N       name                      file     X     Y    bytes\n");
   for (i = 0; i < Nbuffers; i++) {
-    gprint (GP_LOG, "%5d %10s %25s %5d %5d %10d\n",
-             i, buffers[i][0].name, buffers[i][0].file, 
-             buffers[i][0].header.Naxis[0], buffers[i][0].header.Naxis[1],
-             buffers[i][0].header.size + buffers[i][0].matrix.size);
-  }
-  return (TRUE);
-}
+    gprint (GP_LOG, "%5d %10s %25s %5lld %5lld %10lld\n",
+            i, buffers[i][0].name, buffers[i][0].file, 
+            (long long) buffers[i][0].header.Naxis[0], (long long) buffers[i][0].header.Naxis[1],
+            (long long) buffers[i][0].header.datasize + buffers[i][0].matrix.datasize);
+  }
+  return (TRUE);
+}