Changeset 27368 for branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imrough.c

Timestamp:

Mar 19, 2010, 5:35:25 PM (16 years ago)

Author:

eugene

Message:

update ohana formatting functions to check format and associated types; fixes derived from format checks

File:

• branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imrough.c (modified) (3 diffs)

branches/eam_branches/largefiles.20100314/Ohana/src/opihi/dvo/imrough.c

@@ -267 +267 @@
     
     /* load existing data from database */
-    gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
+    gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
     ALLOCATE (image, RegImage, Nimage);
     status = fread (image, sizeof(RegImage), Nimage, f);
@@ -273 +273 @@
     
     if (status != Nimage) {
-      gprint (GP_ERR, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status);
+      gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %d)\n", (long long) Nimage, status);
       gfits_free_header (&header);
       free (image);
@@ -304 +304 @@
   /* convert to internal format */
   image = (RegImage *) table.buffer;
-  gfits_scan (table.header, "NAXIS2", "%d", 1, &Nimage);
+  gfits_scan (table.header, "NAXIS2", "%lld", 1, (long long *) &Nimage);
   gfits_convert_RegImage (image, sizeof (RegImage), Nimage);