Changeset 8627 for trunk/psLib/src/fits/psFitsTable.c

Timestamp:

Aug 25, 2006, 6:34:28 PM (20 years ago)

Author:

jhoblitt

Message:

add gcc format attributes to:

psAbort()
psErrorStackPrint()
p_psError()
p_psWarning()
psLogMsg()
p_psTrace()

add PS_ASSERT_LONG_LARGER_THAN_OR_EQUAL
add PS_ASSERT_S64_WITHIN_RANGE
fix PS_ASSERT_LONG_WITHIN_RANGE
fix a wide range of format related issues:

• missing format field specifiers
• missing format args
• incorrect format field specifiers
• constants declared with the wrong type (float vs. int)
• PS_ASSERT* for the wrong type
• attemps to print structs with *printf()
• unportable format specifiers, eg. long vs. long long

File:

• trunk/psLib/src/fits/psFitsTable.c (modified) (8 diffs)

trunk/psLib/src/fits/psFitsTable.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-26 03:11:59 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -74 +74 @@
     }
 
-    psTrace("psLib.fits",5,"Table size is %ix%i\n",numCols, numRows);
+    psTrace("psLib.fits",5,"Table size is %ix%li\n",numCols, numRows);
     // the row parameter in the proper range?
     if (row < 0 || row >= numRows) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("Specified row, %d, is not valid for current table of %d rows."),
-                row,numRows);
+                _("Specified row, %d, is not valid for current table of %ld rows."),
+                row, numRows);
         return NULL;
     }
@@ -110 +110 @@
                     fits_read_col(fits->fd, FITSTYPE, col,row+1, \
                                   1, 1, NULL, &value, &anynul, &status); \
-                    psTrace("psLib.fits",5,"Column #%i, '%s', is type %i, repeat %i, Value = %g\n", \
+                    psTrace("psLib.fits",5,"Column #%i, '%s', is type %i, repeat %li, Value = %g\n", \
                             col, name, typecode, repeat, (double)value); \
                     psMetadataAdd(data,PS_LIST_TAIL, name, \
@@ -144 +144 @@
                     fits_read_col(fits->fd, TSTRING, col,row+1,
                                   1, 1, NULL, &value, &anynul, &status);
-                    psTrace("psLib.fits",5,"Column #%i, '%s', is type %i, repeat %i, value = %s\n",
+                    psTrace("psLib.fits",5,"Column #%i, '%s', is type %i, repeat %li, value = %s\n",
                             col, name, typecode, repeat, value);
                     if (anynul == 0) {
@@ -387 +387 @@
 
     for (int row = 0; row < numRows; row++) {
-        psTrace("psLib.fits",5,"Reading row %i of %i\n",row, numRows);
+        psTrace("psLib.fits",5,"Reading row %i of %li\n",row, numRows);
         table->data[row] = psFitsReadTableRow(fits,row);
         table->n++;
@@ -507 +507 @@
                 // unsupported type -- treating as an error
                 psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                        "Unsupported data type (%d) for Metadata Item '%s' in row %d.",
-                        colItem->type, colItem->name, row);
+                        "Unsupported data type (%d) for Metadata Item '%s' in row %ld.",
+                        colItem->type, colItem->name, i);
                 psFree(rowIter);
                 psFree(colSpecs);
@@ -620 +620 @@
         char fitsErr[MAX_STRING_LENGTH];
         fits_get_errstatus(status, fitsErr);
-        psError(PS_ERR_LOCATION_INVALID, true, "Unable to create FITS table with %d columns and %d rows:",
+        psError(PS_ERR_LOCATION_INVALID, true, "Unable to create FITS table with %ld columns and %ld rows: %s",
                 numColumns, table->n, fitsErr);
         psFree(colSpecsIter);
@@ -709 +709 @@
             char fitsErr[MAX_STRING_LENGTH];
             fits_get_errstatus(status, fitsErr);
-            psError(PS_ERR_LOCATION_INVALID, true, "Unable to write column %d of FITS table:",
+            psError(PS_ERR_LOCATION_INVALID, true, "Unable to write column %ld of FITS table: %s",
                     colNum, fitsErr);
             psFree(colSpecsIter);