Changeset 34405 for trunk/Ohana/src/libfits/header/F_scan.c

Timestamp:

Sep 5, 2012, 4:25:56 PM (14 years ago)

Author:

eugene

Message:

merging change from eam_branches/ipp-20120805: adding psfQF, psfQFperf to both average and measure; deprecate average.Xp

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/header/F_scan.c (modified) (2 diffs)

trunk/Ohana/src/libfits/header/F_scan.c

@@ -85 +85 @@
 
   // XXX is this safe for 64bit off_t and 32bit off_t?
+  // XXX the problem is that we read FITS files on many machine types: I need to ensure 
+  // that we are portable -- this sseems inconsistent
   if (!strcmp (mode, "%jd"))  { *va_arg (argp, intmax_t *)           = value; return (TRUE); }
 
@@ -220 +222 @@
   if ((*q == 'd') || (*q == 'D')) value *= pow (10.0, atof (q + 1));
 
-  if (!strcmp (mode, "%d"))   { *va_arg (argp, int *)                = value; return (TRUE); }
-  if (!strcmp (mode, "%ld"))  { *va_arg (argp, long *)               = value; return (TRUE); }
-  if (!strcmp (mode, OFF_T_FMT)) { *va_arg (argp, long long *)       = value; return (TRUE); }
-  if (!strcmp (mode, "%Ld"))  { *va_arg (argp, long long *)          = value; return (TRUE); }
-  if (!strcmp (mode, "%u"))   { *va_arg (argp, unsigned *)           = value; return (TRUE); }
-  if (!strcmp (mode, "%lu"))  { *va_arg (argp, unsigned long *)      = value; return (TRUE); }
-  if (!strcmp (mode, "%llu")) { *va_arg (argp, unsigned long long *) = value; return (TRUE); }
-  if (!strcmp (mode, "%Lu"))  { *va_arg (argp, unsigned long long *) = value; return (TRUE); }
-  if (!strcmp (mode, "%hd"))  { *va_arg (argp, short *)              = value; return (TRUE); }
+  if (!strcmp (mode, "%d"))      { *va_arg (argp, int *)                = value; return (TRUE); }
+  if (!strcmp (mode, "%ld"))     { *va_arg (argp, long *)               = value; return (TRUE); }
+  if (!strcmp (mode, OFF_T_FMT)) { *va_arg (argp, off_t *)              = value; return (TRUE); }
+  if (!strcmp (mode, "%Ld"))     { *va_arg (argp, long long *)          = value; return (TRUE); }
+  if (!strcmp (mode, "%u"))      { *va_arg (argp, unsigned *)           = value; return (TRUE); }
+  if (!strcmp (mode, "%lu"))     { *va_arg (argp, unsigned long *)      = value; return (TRUE); }
+  if (!strcmp (mode, "%llu"))    { *va_arg (argp, unsigned long long *) = value; return (TRUE); }
+  if (!strcmp (mode, "%Lu"))     { *va_arg (argp, unsigned long long *) = value; return (TRUE); }
+  if (!strcmp (mode, "%hd"))     { *va_arg (argp, short *)              = value; return (TRUE); }
+  if (!strcmp (mode, "%jd"))     { *va_arg (argp, intmax_t *)           = value; return (TRUE); }
 
   /* no valid mode found */