Changeset 27517 for branches/eam_branches/20100225/Ohana/src/opihi/cmd.data/rd.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/cmd.data/rd.c (modified) (2 diffs)

branches/eam_branches/20100225/Ohana/src/opihi/cmd.data/rd.c

@@ -153 +153 @@
     buf[0].header.Naxes = 0;
     ALLOCATE (buf[0].matrix.buffer, char, 1);
-    buf[0].matrix.size = 0;
+    buf[0].matrix.datasize = 0;
     buf[0].bitpix = 16;
     buf[0].bzero = 0;
@@ -222 +222 @@
   buf[0].unsign = buf[0].header.unsign;
 
-  gprint (GP_LOG, "read %d bytes from %s into buffer %s\n", 
-           buf[0].header.size + buf[0].matrix.size, argv[2], argv[1]);
+  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]);
 
   blank = 0xffff;