Changeset 8627

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

Location:

trunk/psLib/src

Files:

• astro/psTime.c (modified) (7 diffs)
• db/psDB.c (modified) (7 diffs)
• fits/psFitsImage.c (modified) (3 diffs)
• fits/psFitsTable.c (modified) (8 diffs)
• imageops/psImagePixelExtract.c (modified) (2 diffs)
• imageops/psImageStats.c (modified) (3 diffs)
• math/psBinaryOp.c (modified) (8 diffs)
• math/psMathUtils.c (modified) (5 diffs)
• math/psMatrix.c (modified) (5 diffs)
• math/psMinimizeLMM.c (modified) (5 diffs)
• math/psMinimizePolyFit.c (modified) (9 diffs)
• math/psPolynomialUtils.c (modified) (1 diff)
• math/psSparse.c (modified) (1 diff)
• math/psSpline.c (modified) (2 diffs)
• math/psStats.c (modified) (22 diffs)
• math/psUnaryOp.c (modified) (3 diffs)
• mathtypes/psImage.c (modified) (2 diffs)
• mathtypes/psVector.c (modified) (4 diffs)
• mathtypes/psVector.h (modified) (3 diffs)
• sys/psAbort.h (modified) (3 diffs)
• sys/psAssert.h (modified) (2 diffs)
• sys/psConfigure.c (modified) (2 diffs)
• sys/psError.h (modified) (5 diffs)
• sys/psLogMsg.h (modified) (3 diffs)
• sys/psMemory.c (modified) (2 diffs)
• sys/psTrace.h (modified) (4 diffs)
• types/psArguments.c (modified) (2 diffs)
• types/psArray.c (modified) (2 diffs)
• types/psBitSet.c (modified) (5 diffs)
• types/psHash.c (modified) (4 diffs)
• types/psList.c (modified) (4 diffs)
• types/psLookupTable.c (modified) (5 diffs)
• types/psMetadata.c (modified) (5 diffs)
• types/psMetadataConfig.c (modified) (4 diffs)
• types/psMetadataItemCompare.c (modified) (1 diff)
• xml/psXML.c (modified) (2 diffs)

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.93 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:22 $
+ *  @version $Revision: 1.94 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:27 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -80 +80 @@
 
 // Offset of year 0000 from epoch
-#define YEAR_0000_SEC                 -62125920000.0
+#define YEAR_0000_SEC                 -62125920000
 
 // Offset of year 9999 from epoch
-#define YEAR_9999_SEC                 253202544000.0
+#define YEAR_9999_SEC                 253202544000
 
 /** Static function prototypes */
@@ -299 +299 @@
     if(tablesFrom->n != numTables) {
         p_psMemAllocatePersistent(initialPersistence);
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Incorrect vector size. Size: %d, Expected %d."), tablesFrom->n, numTables);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Incorrect vector size. Size: %ld, Expected %d."), tablesFrom->n, numTables);
         psFree(tablesFrom);
         return false;
@@ -316 +316 @@
     if(tablesTo->n != numTables) {
         p_psMemAllocatePersistent(initialPersistence);
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Incorrect vector size. Size: %d, Expected %d."), tablesTo->n, numTables);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Incorrect vector size. Size: %ld, Expected %d."), tablesTo->n, numTables);
         psFree(tablesFrom);
         psFree(tablesTo);
@@ -335 +335 @@
     if(tablesIndex->n != numTables) {
         p_psMemAllocatePersistent(initialPersistence);
-        psError(PS_ERR_BAD_PARAMETER_VALUE,true,_("Incorrect vector size. Size: %d, Expected %d."),tablesIndex->n,numTables);
+        psError(PS_ERR_BAD_PARAMETER_VALUE,true,_("Incorrect vector size. Size: %ld, Expected %d."),tablesIndex->n,numTables);
         psFree(tablesFrom);
         psFree(tablesTo);
@@ -1357 +1357 @@
 
     // Check valid year range
-    PS_ASSERT_LONG_WITHIN_RANGE(time->sec,YEAR_0000_SEC,YEAR_9999_SEC,NULL)
+    PS_ASSERT_S64_WITHIN_RANGE(time->sec, (psS64)YEAR_0000_SEC, (psS64)YEAR_9999_SEC, NULL);
 
     // Allocate temp strings
@@ -1727 +1727 @@
     // Create output time
     sec = delta + (psF64)tempTime->sec + (psF64)tempTime->nsec/1e9;
-    PS_ASSERT_LONG_WITHIN_RANGE((psS64)sec,0,PS_MAX_S64,outTime);
+    PS_ASSERT_S64_WITHIN_RANGE((psS64)sec, (psS64)0, PS_MAX_S64, NULL);
     outTime->sec = (psS64)sec;
     outTime->nsec = (psU32)((sec - (psF64)outTime->sec)*1e9);
 
     // Error check
-    PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,(psU32)((1e9)-1),outTime);
+    PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,(psU32)((1e9)-1), NULL);
 
     // Convert result to same time type as input

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.87 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-26 00:32:39 $
+ *  @version $Revision: 1.88 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -157 +157 @@
     if (!psDBExplicitTrans(dbh, false)) {
         psError(PS_ERR_UNKNOWN, true,
-                "failed to set transaction type", mysql_error(mysql));
+                "failed to set transaction type. Error: %s", mysql_error(mysql));
 
         mysql_close(mysql);
@@ -1103 +1103 @@
             // convert NaNs to NULL and set the buffer_length for strings
 
-            if ((char *)item->data.V) {
+            if (item->data.str) {
                 // will handle the case of "" as a NULL database value
-                bind[i].buffer_length = (unsigned long)strlen((char *)item->data.V);
+                bind[i].buffer_length = (unsigned long)strlen(item->data.str);
                 bind[i].length  = &bind[i].buffer_length;
                 bind[i].buffer  = psStringCopy(item->data.V);
-                bind[i].is_null = *(char *)item->data.V == '\0'
+                bind[i].is_null = *item->data.str == '\0'
                                   ? (my_bool *)&isNull
                                   : NULL;
@@ -1124 +1124 @@
             // make a copy of the psTime so we don't modify user data when we
             // try to do the conversion
-            if ((char *)item->data.V) {
+            if (item->data.str) {
                 psTime *time = (psTime *)item->data.V;
                 struct tm *tmTime = psTimeToTM(time);
@@ -1252 +1252 @@
         } else if (item->type == PS_DATA_STRING) {
             // + column name + _ + varchar( + length + )
-            psStringAppend(&query, "%s VARCHAR(%s)", item->name, (char *)item->data.V);
+            psStringAppend(&query, "%s VARCHAR(%s)", item->name, item->data.str);
         } else {
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
@@ -1634 +1634 @@
         // + column name + _ + like + _ + ' + value + '
         // check for NULL and empty ("") strings
-        if (item->data.V == NULL || *(char *)item->data.V == '\0') {
+        if (item->data.V == NULL || *item->data.str == '\0') {
             psStringAppend(&query, "%s IS NULL", item->name);
         } else {
@@ -1642 +1642 @@
                 // very large TEXT columns that really shouldn't be
                 // used in a where clause...
-                psStringAppend(&query, "%s LIKE '%s'", item->name, (char *)item->data.V);
+                psStringAppend(&query, "%s LIKE '%s'", item->name, item->data.str);
             } else {
-                psStringAppend(&query, "%s = '%s'", item->name, (char *)item->data.V);
+                psStringAppend(&query, "%s = '%s'", item->name, item->data.str);
             }
         }

trunk/psLib/src/fits/psFitsImage.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-17 22:15:17 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -450 +450 @@
     if (z >= nAxes[2]) {
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                _("Current FITS HDU has %d z-planes, but z-plane %d was specified."),
-                nAxes[2],z);
+                _("Current FITS HDU has %ld z-planes, but z-plane %d was specified."),
+                nAxes[2], z);
         return false;
     }
@@ -472 +472 @@
             lastPixel[1] < 1 || lastPixel[1] > nAxes[1]) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                "Input image [size of %ix%i] at position (%i,%i) does not all lay in the %ix%i FITS image.",
+                "Input image [size of %ix%i] at position (%i,%i) does not all lay in the %lix%li FITS image.",
                 numCols, numRows,
                 x0, y0,

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);

trunk/psLib/src/imageops/psImagePixelExtract.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -790 +790 @@
     if (radii->n < 2) {
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                _("Input radii vector size, %d, can not be less than 2."),
+                _("Input radii vector size, %ld, can not be less than 2."),
                 radii->n);
         psFree(out);

trunk/psLib/src/imageops/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.99 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.100 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -592 +592 @@
         return -1;
     }/* else if (col0 == col1 && row0 == row1) {
-                                            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                                                    "Invalid psRegion specified.  Region contains only 1 pixel.\n");
-                                            return -1;
-                                        }
-                                    */
+                                                psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                                                        "Invalid psRegion specified.  Region contains only 1 pixel.\n");
+                                                return -1;
+                                            }
+                                        */
     x0 = col0;
     x1 = col1;
@@ -631 +631 @@
     case PS_TYPE_C64:
     default:
+        // XXX this should include the mask type (as a string)
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                _("Input psImage mask type, %s, is not the supported mask datatype of %s."), type, PS_TYPE_U8);
+                _("Input psImage mask type is not a supported mask datatype"));
+
         return -1;
     }

trunk/psLib/src/math/psBinaryOp.c

@@ -30 +30 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -107 +107 @@
     long n2 = ((psVector*)IN2)->n; \
     if (n1 != n2) { \
-        psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d.  Number of elements must match."), n1, n2); \
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %ld vs %ld.  Number of elements must match."), n1, n2); \
         if (OUT != IN1 && OUT != IN2) { \
             psFree(OUT); \
@@ -129 +129 @@
     if (((psVector*)IN1)->type.dimen == PS_DIMEN_VECTOR) { /* Regular vectors */ \
         if (n1 != numRows2) { \
-            psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d.  Number of elements must match."), n1, numRows2); \
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %ld vs %ld.  Number of elements must match."), n1, numRows2); \
             if (OUT != IN1 && OUT != IN2) { \
                 psFree(OUT); \
@@ -146 +146 @@
     } else {  /* Transposed vectors */ \
         if (n1 != numCols2) { \
-            psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d.  Number of elements must match."), n1, numCols2); \
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %ld vs %ld.  Number of elements must match."), n1, numCols2); \
             if (OUT != IN1 && OUT != IN2) { \
                 psFree(OUT); \
@@ -187 +187 @@
     if (((psVector*)IN2)->type.dimen == PS_DIMEN_VECTOR) { /* Regular vectors */ \
         if (n2 != numRows1) { \
-            psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d.  Number of elements must match."), n2, numRows1); \
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %ld vs %ld.  Number of elements must match."), n2, numRows1); \
             if (OUT != IN1 && OUT != IN2) { \
                 psFree(OUT); \
@@ -204 +204 @@
     } else {  /* Transposed vectors */ \
         if (n2 != numCols1) { \
-            psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d.  Number of elements must match."), n2, numCols1); \
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %ld vs %ld.  Number of elements must match."), n2, numCols1); \
             if (OUT != IN1) { \
                 psFree(OUT); \
@@ -229 +229 @@
     long numCols2 = ((psImage*)IN2)->numCols; \
     if (numRows1 != numRows2 || numCols1 != numCols2) { \
-        psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Specified psImage dimensions differed, %dx%d vs %dx%d."), \
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Specified psImage dimensions differed, %ldx%ld vs %ldx%ld."), \
                 numCols1, numRows1, numCols2, numRows2); \
         if (OUT != IN1 && OUT != IN2) { \
@@ -360 +360 @@
     } else {                                                                                                 \
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,                                                            \
-                "Types (%x,%x) are not appropriate for logical OR.\n", IN1->type, IN2->type);                \
+                "Types (%x,%x) are not appropriate for logical OR.\n", IN1->type, IN2->type);               \
         return NULL;                                                                                         \
     }                                                                                                        \

trunk/psLib/src/math/psMathUtils.c

@@ -3 +3 @@
  *  This file contains standard math routines.
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:26:44 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -58 +58 @@
     long max; \
     long mid; \
-    psTrace("psLib.math", 4, "---- %s() begin ----\n", __func__); \
+    psTrace("psLib.math", 4, "---- () begin ----\n"); \
     /* psTrace("psLib.math", 6, "Determining the bin for: %f\n", x); */\
     if (value < bounds[0]) { \
         psLogMsg(__func__, PS_LOG_WARN, \
                  "vectorBinDisect%s(): ordinate %f is outside vector range (%f - %f).", \
-                 #TYPE, value, bounds[0], bounds[numBins-1]); \
+                 #TYPE, (double)value, (double)bounds[0], (double)bounds[numBins-1]); \
         return(-2); \
     } \
@@ -69 +69 @@
         psLogMsg(__func__, PS_LOG_WARN, \
                  "vectorBinDisect%s(): ordinate %f is outside vector range (%f - %f).", \
-                 #TYPE, value, bounds[0], bounds[numBins-1]); \
+                 #TYPE, (double)value, (double)bounds[0], (double)bounds[numBins-1]); \
         return(-1); \
     } \
@@ -79 +79 @@
         \
         if (value == bounds[mid]) { \
-            psTrace("psLib.math", 4, "---- %s(%d) end (1) ----\n", __func__, mid); \
+            psTrace("psLib.math", 4, "---- %s(%ld) end (1) ----\n", __func__, mid); \
             return(mid); \
         } else if (value < bounds[mid]) { \
@@ -88 +88 @@
         mid = ((max+1)+min)/2; \
     } \
-    psTrace("psLib.math", 4, "---- %s(%d) end (2) ----\n", __func__, min); \
+    psTrace("psLib.math", 4, "---- %s(%ld) end (2) ----\n", __func__, min); \
     return(min); \
 }

trunk/psLib/src/math/psMatrix.c

@@ -21 +21 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:26:44 $
+ *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -675 +675 @@
         if (outVector->n != inImage->numRows) {
             psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                    "Image and vector sizes differ: (%d vs %d).",
+                    "Image and vector sizes differ: (%d vs %ld).",
                     inImage->numRows, outVector->n);
             psMatrixToVector_EXIT;
@@ -691 +691 @@
         if (outVector->n != inImage->numCols) {
             psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                    "Image and vector sizes differ: (%d vs %d).",
+                    "Image and vector sizes differ: (%d vs %ld).",
                     inImage->numCols, outVector->n);
             psMatrixToVector_EXIT;
@@ -727 +727 @@
         } else if (outImage->numRows != inVector->n) {
             psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                    "Image and vector sizes differ: (%d vs %d).",
+                    "Image and vector sizes differ: (%d vs %ld).",
                     outImage->numRows, inVector->n);
             VECTORTOMATRIX_CLEANUP;
@@ -746 +746 @@
         } else if (outImage->numCols != inVector->n) {
             psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                    "Image and vector sizes differ: (%d vs %d).",
+                    "Image and vector sizes differ: (%d vs %ld).",
                     outImage->numCols, inVector->n);
             VECTORTOMATRIX_CLEANUP;

trunk/psLib/src/math/psMinimizeLMM.c

@@ -10 +10 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:26:44 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -181 +181 @@
     psF64 rcF64 = p_psMinLM_SetABX(alpha, beta, params, paramMask, x, y, dy, func);
     if (isnan(rcF64)) {
-        psTrace (__func__, 5, "p_psMinLM_SetABX() returned a NAN.\n");
+        psTrace ("psLib.math", 5, "p_psMinLM_SetABX() returned a NAN.\n");
         rc = false;
     }
-    psTrace("psLib.math", 5, "p_psMinLM_SetABX() was succesful\n", __func__);
+    psTrace("psLib.math", 5, "p_psMinLM_SetABX() was succesful\n");
 
     psBool rcBool = p_psMinLM_GuessABP(Alpha, delta, Params, alpha, beta, params, paramMask, NULL, NULL, NULL, 0.0);
     if (rcBool == false) {
-        psTrace (__func__, 5, "p_psMinLM_GuessABP() returned FALSE.\n");
+        psTrace ("psLib.math", 5, "p_psMinLM_GuessABP() returned FALSE.\n");
         rc = false;
     }
-    psTrace("psLib.math", 5, "p_psMinLM_GuessABP() was succesful\n", __func__);
+    psTrace("psLib.math", 5, "p_psMinLM_GuessABP() was succesful\n");
 
     psFree(alpha);
@@ -200 +200 @@
         psFree(dy);
     }
-    psTrace("psLib.math", 3, "---- %s() end ----\n", __func__);
+    psTrace("psLib.math", 3, "---- end ----\n");
     return(rc);
 }
@@ -417 +417 @@
         psTrace("psLib.math", 6, "The current Param vector: \n");
         for (psS32 i = 0 ; i < Params->n ; i++) {
-            psTrace("psLib.math", 6, "Params[%d] is %f\n", Params->data.F32[i]);
+            psTrace("psLib.math", 6, "Params[%d] is %f\n", i, Params->data.F32[i]);
         }
     }
@@ -447 +447 @@
                 psTrace("psLib.math", 6, "The current Param vector: \n");
                 for (psS32 i = 0 ; i < Params->n ; i++) {
-                    psTrace("psLib.math", 6, "Params[%d] is %f\n", Params->data.F32[i]);
+                    psTrace("psLib.math", 6, "Params[%d] is %f\n", i, Params->data.F32[i]);
                 }
             }

trunk/psLib/src/math/psMinimizePolyFit.c

@@ -10 +10 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-22 15:01:12 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -816 +816 @@
     //
     for (psS32 N = 0; N < stats->clipIter; N++) {
-        psTrace("psLib.math", 6, "Loop iteration %d.  Calling psVectorFitPolynomial1D()\n");
+        psTrace("psLib.math", 6, "Loop iteration %d.  Calling psVectorFitPolynomial1D()\n", N);
         psS32 Nkeep = 0;
         if (psTraceGetLevel(__func__) >= 6) {
@@ -894 +894 @@
         // since the polynomial fit won't change.
         //
-        psTrace("psLib.math", 6, "keeping %d of %d pts for fit\n", Nkeep, x->n);
+        psTrace("psLib.math", 6, "keeping %d of %ld pts for fit\n", Nkeep, x->n);
         psFree(fit);
     }
@@ -1250 +1250 @@
 
     for (psS32 N = 0; N < stats->clipIter; N++) {
-        psTrace("psLib.math", 6, "Loop iteration %d.  Calling psVectorFitPolynomial1D()\n");
+        psTrace("psLib.math", 6, "Loop iteration %d.  Calling psVectorFitPolynomial1D()\n", N);
         psS32 Nkeep = 0;
         if (psTraceGetLevel(__func__) >= 6) {
@@ -1331 +1331 @@
         }
 
-        psTrace("psLib.math", 6, "keeping %d of %d pts for fit\n", Nkeep, x->n);
+        psTrace("psLib.math", 6, "keeping %d of %ld pts for fit\n", Nkeep, x->n);
         psFree(fit);
     }
@@ -1770 +1770 @@
 
     for (psS32 N = 0; N < stats->clipIter; N++) {
-        psTrace("psLib.math", 6, "Loop iteration %d.  Calling psVectorFitPolynomial1D()\n");
+        psTrace("psLib.math", 6, "Loop iteration %d.  Calling psVectorFitPolynomial1D()\n", N);
         psS32 Nkeep = 0;
         if (psTraceGetLevel(__func__) >= 6) {
@@ -1851 +1851 @@
         }
 
-        psTrace("psLib.math", 6, "keeping %d of %d pts for fit\n", Nkeep, x->n);
+        psTrace("psLib.math", 6, "keeping %d of %ld pts for fit\n", Nkeep, x->n);
         psFree(fit);
     }
@@ -2338 +2338 @@
 
     for (psS32 N = 0; N < stats->clipIter; N++) {
-        psTrace("psLib.math", 6, "Loop iteration %d.  Calling psVectorFitPolynomial4D()\n");
+        psTrace("psLib.math", 6, "Loop iteration %d.  Calling psVectorFitPolynomial4D()\n", N);
         psS32 Nkeep = 0;
         if (psTraceGetLevel(__func__) >= 6) {
@@ -2420 +2420 @@
         }
 
-        psTrace("psLib.math", 6, "keeping %d of %d pts for fit\n", Nkeep, x->n);
+        psTrace("psLib.math", 6, "keeping %d of %ld pts for fit\n", Nkeep, x->n);
         psFree (fit);
     }

trunk/psLib/src/math/psPolynomialUtils.c

@@ -105 +105 @@
         }
 
-        psTrace (__func__, 4, "keeping %d of %d pts for fit\n",
+        psTrace (__func__, 4, "keeping %d of %ld pts for fit\n",
                  Nkeep, x->n);
 

trunk/psLib/src/math/psSparse.c

@@ -62 +62 @@
 
     if (i < j) {
-        psLogMsg(__func__, PS_LOG_WARN, "i=%ld, j=%ld refers to a sub-diagonal element; values switched.\n");
+        psLogMsg(__func__, PS_LOG_WARN, "i=%d, j=%d refers to a sub-diagonal element; values switched.\n", i, j);
         int temp = i;
         i = j;

trunk/psLib/src/math/psSpline.c

@@ -6 +6 @@
 *  This file contains the routines that allocate, free, and evaluate splines.
 *
-*  @version $Revision: 1.152 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-09 02:26:44 $
+*  @version $Revision: 1.153 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-26 04:34:28 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -213 +213 @@
     PS_ASSERT_VECTOR_NON_NULL(y, NULL);
     PS_ASSERT_VECTOR_TYPE_F32_OR_F64(y, NULL);
-    PS_ASSERT_INT_LARGER_THAN_OR_EQUAL(y->n, 2, NULL);
+    PS_ASSERT_LONG_LARGER_THAN_OR_EQUAL(y->n, (long)2, NULL);
     psS32 numSplines = (y->n)-1;
     psTrace("psLib.math", 5, "numSplines is %d\n", numSplines);

trunk/psLib/src/math/psStats.c

@@ -16 +16 @@
  * use ->min and ->max (PS_STAT_USE_RANGE)
  *
- *  @version $Revision: 1.184 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:26:44 $
+ *  @version $Revision: 1.185 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -665 +665 @@
     if (count == 0) {
         stats->sampleStdev = NAN;
-        psLogMsg(__func__, PS_LOG_WARN, "WARNING: vectorSampleStdev(): no valid psVector elements (%d).  Setting stats->sampleStdev = NAN.\n", count);
+        psLogMsg(__func__, PS_LOG_WARN, "WARNING: vectorSampleStdev(): no valid psVector elements (%ld).  Setting stats->sampleStdev = NAN.\n", count);
         return false;
     }
     if (count == 1) {
         stats->sampleStdev = 0.0;
-        psLogMsg(__func__, PS_LOG_WARN, "WARNING: vectorSampleStdev(): only one valid psVector elements (%d).  Setting stats->sampleStdev = 0.0.\n", count);
+        psLogMsg(__func__, PS_LOG_WARN, "WARNING: vectorSampleStdev(): only one valid psVector elements (%ld).  Setting stats->sampleStdev = 0.0.\n", count);
         return false;
     }
@@ -713 +713 @@
 
     // Ensure that stats->clipSigma is within the proper range.
-    PS_ASSERT_INT_WITHIN_RANGE(stats->clipSigma,
-                               PS_CLIPPED_SIGMA_LB,
-                               PS_CLIPPED_SIGMA_UB, -1);
+    PS_ASSERT_FLOAT_WITHIN_RANGE(stats->clipSigma,
+                                 PS_CLIPPED_SIGMA_LB,
+                                 PS_CLIPPED_SIGMA_UB, -1);
 
     // Allocate a psStats structure for calculating the mean, median, and
@@ -777 +777 @@
                         fabsf(myVector->data.F32[j] - clippedMean) > stats->clipSigma * errors->data.F32[j]) {
                     tmpMask->data.U8[j] = 0xff;
-                    psTrace("psLib.math", 10, "Clipped %d: %f +/- %f\n", j,
+                    psTrace("psLib.math", 10, "Clipped %ld: %f +/- %f\n", j,
                             myVector->data.F32[j], errors->data.F32[j]);
                     numClipped++;
@@ -788 +788 @@
                         fabsf(myVector->data.F32[j] - clippedMean) > (stats->clipSigma * clippedStdev)) {
                     tmpMask->data.U8[j] = 0xff;
-                    psTrace("psLib.math", 10, "Clipped %d: %f\n", j, myVector->data.F32[j]);
+                    psTrace("psLib.math", 10, "Clipped %ld: %f\n", j, myVector->data.F32[j]);
                     numClipped++;
                     clipped = true;
@@ -896 +896 @@
     PS_ASSERT_VECTOR_TYPE(yVec, PS_TYPE_F32, NAN);
     //    PS_ASSERT_VECTORS_SIZE_EQUAL(xVec, yVec, NAN);
-    PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, (xVec->n - 1), NAN);
-    PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, (yVec->n - 1), NAN);
+    PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, (int)(xVec->n - 1), NAN);
+    PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, (int)(yVec->n - 1), NAN);
 
     psVector *x = psVectorAlloc(3, PS_TYPE_F64);
@@ -1008 +1008 @@
     psTrace("psLib.math", 4, "---- %s() begin ----\n", __func__);
     PS_ASSERT_VECTOR_NON_NULL(params, NAN);
-    PS_ASSERT_VECTOR_SIZE(params, 2, NAN);
+    PS_ASSERT_VECTOR_SIZE(params, (long)2, NAN);
     PS_ASSERT_VECTOR_TYPE(params, PS_TYPE_F32, NAN);
     PS_ASSERT_VECTOR_NON_NULL(coords, NAN);
-    PS_ASSERT_VECTOR_SIZE(coords, 1, NAN);
+    PS_ASSERT_VECTOR_SIZE(coords, (long)1, NAN);
     PS_ASSERT_VECTOR_TYPE(coords, PS_TYPE_F32, NAN);
 
@@ -1020 +1020 @@
     psF32 gauss = psGaussian(x, mean, stdev, false);
     if (deriv) {
-        PS_ASSERT_VECTOR_SIZE(deriv, 2, NAN);
+        PS_ASSERT_VECTOR_SIZE(deriv, (long)2, NAN);
         PS_ASSERT_VECTOR_TYPE(deriv, PS_TYPE_F32, NAN);
         psF32 tmp = (x - mean) * gauss;
@@ -1136 +1136 @@
         // we get here, we know that binSize != 0.0.
         long numBins = (max - min) / binSize; // Number of bins
-        psTrace("psLib.math", 6, "Numbins is %d\n", numBins);
+        psTrace("psLib.math", 6, "Numbins is %ld\n", numBins);
         psTrace("psLib.math", 6, "Creating a robust histogram from data range (%.2f - %.2f)\n", min, max);
         // Generate the histogram
@@ -1159 +1159 @@
         // ADD step 2: Find the bin which contains the 50% data point.
         totalDataPoints = cumulative->nums->data.F32[numBins - 1];
-        psTrace("psLib.math", 6, "Total data points is %d\n", totalDataPoints);
+        psTrace("psLib.math", 6, "Total data points is %ld\n", totalDataPoints);
         long binMedian;
         if (totalDataPoints/2.0 < cumulative->nums->data.F32[0]) {
@@ -1170 +1170 @@
             if (binMedian < 0) {
                 psError(PS_ERR_UNKNOWN, false,
-                        "Failed to calculate the 50 precent data point (%d).\n", binMedian);
+                        "Failed to calculate the 50 precent data point (%ld).\n", binMedian);
                 psFree(statsMinMax);
                 psFree(histogram);
@@ -1179 +1179 @@
             }
         }
-        psTrace("psLib.math", 6, "The median bin is %d (%.2f to %.2f)\n", binMedian,
+        psTrace("psLib.math", 6, "The median bin is %ld (%.2f to %.2f)\n", binMedian,
                 cumulative->bounds->data.F32[binMedian], cumulative->bounds->data.F32[binMedian+1]);
 
@@ -1217 +1217 @@
             }
         }
-        psTrace("psLib.math", 6, "The 15.8655%% and 84.1345%% data point bins are (%d, %d).\n",
+        psTrace("psLib.math", 6, "The 15.8655%% and 84.1345%% data point bins are (%ld, %ld).\n",
                 binLo, binHi);
         psTrace("psLib.math", 6, "binLo midpoint is %f\n", PS_BIN_MIDPOINT(cumulative, binLo));
@@ -1248 +1248 @@
         #else
         // This code basically interpolates to find the positions exactly.
-        psTrace("psLib.math", 6, "binLo is %d.  Nums at that bin and the next are (%.2f, %.2f)\n",
+        psTrace("psLib.math", 6, "binLo is %ld.  Nums at that bin and the next are (%.2f, %.2f)\n",
                 binLo, cumulative->nums->data.F32[binLo], cumulative->nums->data.F32[binLo+1]);
-        psTrace("psLib.math", 6, "binHi is %d.  Nums at that bin and the next are (%.2f, %.2f)\n",
+        psTrace("psLib.math", 6, "binHi is %ld.  Nums at that bin and the next are (%.2f, %.2f)\n",
                 binHi, cumulative->nums->data.F32[binHi], cumulative->nums->data.F32[binHi+1]);
 
@@ -1304 +1304 @@
             psTrace("psLib.math", 6, "Masking data more than 25 bins from the median\n");
             psTrace("psLib.math", 6,
-                    "The median is at bin number %d.  We mask bins outside the bin range (%d:%d)\n",
+                    "The median is at bin number %ld.  We mask bins outside the bin range (%ld:%ld)\n",
                     binMedian, maskLo, maskHi);
             psTrace("psLib.math", 6, "Masking data outside (%f %f)\n", medianLo, medianHi);
@@ -1310 +1310 @@
                 if ((myVector->data.F32[i] < medianLo) || (myVector->data.F32[i] > medianHi)) {
                     mask->data.U8[i] = 0xff;
-                    psTrace("psLib.math", 6, "Masking element %d is %f\n", i, myVector->data.F32[i]);
+                    psTrace("psLib.math", 6, "Masking element %ld is %f\n", i, myVector->data.F32[i]);
                 }
             }
@@ -1350 +1350 @@
         return false;
     }
-    psTrace("psLib.math", 6, "The 25-percent and 75-precent data point bins are (%d, %d).\n", binLo25, binHi25);
+    psTrace("psLib.math", 6, "The 25-percent and 75-precent data point bins are (%ld, %ld).\n", binLo25, binHi25);
 
     // ADD step 8: Interpolate to find these two positions exactly: these are the upper and lower quartile
@@ -1381 +1381 @@
     }
     stats->robustN50 = N50;
-    psTrace("psLib.math", 6, "The robustN50 is %d.\n", N50);
+    psTrace("psLib.math", 6, "The robustN50 is %ld.\n", N50);
 
 
@@ -1413 +1413 @@
         psTrace("psLib.math", 6, "The new min/max values are (%f, %f).\n", min, max);
         psTrace("psLib.math", 6, "The new bin size is %f.\n", newBinSize);
-        psTrace("psLib.math", 6, "The numBins is %d\n", numBins);
+        psTrace("psLib.math", 6, "The numBins is %ld\n", numBins);
 
         psHistogram *histogram = psHistogramAlloc(min, max, numBins); // A new histogram (without outliers)
@@ -1460 +1460 @@
             }
         }
-        psTrace("psLib.math", 6, "The peak bin is %d, with %f data.n", binNum, binMaxNums);
+        psTrace("psLib.math", 6, "The peak bin is %ld, with %f data.n", binNum, binMaxNums);
 
         // Fit a Gaussian to the bins in the range 20 sigma of the robust histogram median.
@@ -1696 +1696 @@
     PS_ASSERT_VECTOR_NON_NULL(bounds, NULL);
     PS_ASSERT_VECTOR_TYPE(bounds, PS_TYPE_F32, NULL);
-    PS_ASSERT_INT_LARGER_THAN_OR_EQUAL(bounds->n, 2, NULL);
+    PS_ASSERT_LONG_LARGER_THAN_OR_EQUAL(bounds->n, (long)2, NULL);
 
     // Allocate memory for the new histogram structure.
@@ -1761 +1761 @@
     PS_ASSERT_PTR_NON_NULL(out->bounds, false);
     PS_ASSERT_PTR_NON_NULL(out->nums, false);
-    PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, ((out->nums->n)-1), false);
+    PS_ASSERT_LONG_WITHIN_RANGE(binNum, (long)0, (long)((out->nums->n)-1), false);
     PS_ASSERT_FLOAT_LARGER_THAN_OR_EQUAL(error, 0.0, false);
     PS_ASSERT_FLOAT_WITHIN_RANGE(data, out->bounds->data.F32[0],

trunk/psLib/src/math/psUnaryOp.c

@@ -30 +30 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -78 +78 @@
     long nOut = ((psVector*)OUT)->n; \
     if (nIn != nOut) { \
-        psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d.  Number of elements must match."), nIn, nOut); \
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %ld vs %ld.  Number of elements must match."), nIn, nOut); \
         if (OUT != IN) { \
             psFree(OUT); \
@@ -99 +99 @@
     long numColsOut = ((psImage*)OUT)->numCols; \
     if(numRowsIn!=numRowsOut || numColsIn!=numColsOut) { \
-        psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Specified psImage dimensions differed, %dx%d vs %dx%d."), \
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Specified psImage dimensions differed, %ldx%ld vs %ldx%ld."), \
                 numColsIn, numRowsIn, numColsOut, numRowsOut); \
         if (OUT != IN) { \

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.113 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.114 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -203 +203 @@
 
     default:
-        psError (PS_ERR_BAD_PARAMETER_TYPE, true, "datatype %d not defined in psImageInit\n", image->type);
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true, "datatype not defined in psImageInit\n");
     }
     return (false);

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.81 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-16 03:28:13 $
+*  @version $Revision: 1.82 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-26 04:34:28 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -301 +301 @@
                 PS_TYPE_NAME(typeStr,type); \
                 psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
-                        _("Input psVector is an unsupported type (0x%x)."), \
+                        _("Input psVector is an unsupported type (0x%s)."), \
                         typeStr); \
                 psFree(output); \
@@ -326 +326 @@
             PS_TYPE_NAME(typeStr,type);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                    _("Input psVector is an unsupported type (0x%x)."),
+                    _("Input psVector is an unsupported type (0x%s)."),
                     typeStr);
             psFree(output);
@@ -816 +816 @@
         return (true);
     default:
-        psError (PS_ERR_BAD_PARAMETER_TYPE, true, "datatype %d not defined in psImageInit\n", vector->type);
+        psError (PS_ERR_BAD_PARAMETER_TYPE, true, "datatype not defined in psImageInit\n");
         return (false);
     }

trunk/psLib/src/mathtypes/psVector.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-16 20:36:04 $
+ *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -318 +318 @@
 if ((VEC1)->n != (VEC2)->n) { \
     psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
-            "psVector %s has size %d, psVector %s has size %d.", \
+            "psVector %s has size %ld, psVector %s has size %ld.", \
             #VEC1, (VEC1)->n, #VEC2, (VEC2)->n); \
     return(RVAL); \
@@ -326 +326 @@
 if ((VEC)->n != (SIZE)) { \
     psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
-            "psVector %s has size %d, should be %d.", \
+            "psVector %s has size %ld, should be %ld.", \
             #VEC, (VEC)->n, (SIZE)); \
     return(RVAL); \

trunk/psLib/src/sys/psAbort.h

@@ -12 +12 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 23:39:51 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
  *
  */
+#ifdef __GNUC__
+void psAbort(
+    const char *name,                  ///< Source of abort such as file or function detected
+    const char *format,                   ///< A printf style formatting statement defining msg
+    ...
+) __attribute__((format(printf, 2, 3)));
+#else // __GNUC__
 void psAbort(
     const char *name,                  ///< Source of abort such as file or function detected
@@ -42 +49 @@
     ...
 );
+#endif // __GNUC__
 
 /** @} */ // Doxygen - End of SystemGroup Functions

trunk/psLib/src/sys/psAssert.h

@@ -3 +3 @@
 
 #include <assert.h>
+#include <inttypes.h>
+
 #include "psError.h"
 #include "psLogMsg.h"
@@ -155 +157 @@
 if ((NAME) < (LOWER) || (NAME) > (UPPER)) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
-            "Error: %s, %lld, is out of range.", \
+            "Error: %s, %ld, is out of range.  Must be between %ld and %ld.", \
+            #NAME, NAME, LOWER, UPPER); \
+    return RVAL; \
+}
+
+#define PS_ASSERT_LONG_LARGER_THAN_OR_EQUAL(NAME1, NAME2, RVAL) \
+if (!((NAME1) >= (NAME2))) { \
+    psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Error: !(%s >= %s) (%ld %ld).",\
+            #NAME1, #NAME2, NAME1, NAME2); \
+    return(RVAL); \
+}
+
+#define PS_ASSERT_S64_WITHIN_RANGE(NAME, LOWER, UPPER, RVAL) \
+if ((NAME) < (LOWER) || (NAME) > (UPPER)) { \
+    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+            "Error: %s, %" PRId64 ", is out of range.  Must be between %" PRId64 " and %" PRId64 ".", \
             #NAME, NAME, LOWER, UPPER); \
     return RVAL; \

trunk/psLib/src/sys/psConfigure.c

@@ -13 +13 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -80 +80 @@
     nCorrupted = psMemCheckCorruption(false);
     if (nCorrupted > 0) {
-        psError(PS_ERR_UNKNOWN, true, "%d memory blocks corrupted; list written to %s.\n", nCorrupted);
+        psError(PS_ERR_UNKNOWN, true, "%d memory blocks corrupted; list written to %s.\n", nCorrupted, memCheckName);
     } else {
         psLogMsg(__func__, PS_LOG_INFO, "No memory corruption found.\n");

trunk/psLib/src/sys/psError.h

@@ -12 +12 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:11:25 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -92 +92 @@
  *
  */
+#ifdef __GNUC__
 void psErrorStackPrint(
     FILE* fd,                          ///< destination file descriptor
-    const char* format,                   ///< printf-style format of header line
-    ...                                ///< any parameters required in fmt
-);
+    const char* format,                ///< printf-style format of header line
+    ...                                ///< any parameters required in fmt
+) __attribute__((format(printf, 2, 3)));
+#else // __GNUC__
+void psErrorStackPrint(
+    FILE* fd,                          ///< destination file descriptor
+    const char* format,                ///< printf-style format of header line
+    ...                                ///< any parameters required in fmt
+);
+#endif // __GNUC__
+
 
 #ifndef SWIG
@@ -155 +164 @@
  *  @return psErrorcode    the given error code
  */
+#ifdef __GNUC__
 psErrorCode p_psError(
     const char* filename,              ///< file name
@@ -163 +173 @@
     const char* format,                ///< printf-style format of header line
     ...                                ///< any parameters required in fmt
-);
+) __attribute__((format(printf, 6, 7)));
+#else // __GNUC__
+psErrorCode p_psError(
+    const char* filename,              ///< file name
+    unsigned int lineno,               ///< line number in file
+    const char* func,                  ///< function name
+    psErrorCode code,                  ///< Error class code
+    bool new,                          ///< true if error originates at this location
+    const char* format,                ///< printf-style format of header line
+    ...                                ///< any parameters required in fmt
+);
+#endif // __GNUC__
 
 /** Logs a warning message.
@@ -172 +193 @@
  *
 */
+#ifdef __GNUC__
 void p_psWarning(
     const char* file,                  ///< file name
     int lineno,                        ///< line number in file
     const char* func,                  ///< function name
-    const char* fmt,                   ///< printf-style format of header line
-    ...                                ///< any parameters required in fmt
-);
+    const char* format,                ///< printf-style format of header line
+    ...                                ///< any parameters required in fmt
+) __attribute__((format(printf, 4, 5)));
+#else // __GNUC__
+void p_psWarning(
+    const char* file,                  ///< file name
+    int lineno,                        ///< line number in file
+    const char* func,                  ///< function name
+    const char* format,                ///< printf-style format of header line
+    ...                                ///< any parameters required in fmt
+);
+#endif // __GNUC__
 
 

trunk/psLib/src/sys/psLogMsg.h

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-16 23:01:10 $
+ *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -90 +90 @@
  *
  */
+#ifdef __GNUC__
+void psLogMsg(
+    const char *name,                  ///< name of the log source
+    int level,                         ///< severity level of this log message
+    const char *format,                ///< printf-style format command
+    ...
+) __attribute__((format(printf, 3, 4)));
+#else // __GNUC__
 void psLogMsg(
     const char *name,                  ///< name of the log source
@@ -96 +104 @@
     ...
 );
+#endif // __GNUC__
 
 #ifndef SWIG

trunk/psLib/src/sys/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.79 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-24 02:17:17 $
+*  @version $Revision: 1.80 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-26 04:34:28 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -530 +530 @@
         ptr = memExhaustedCallback(size);
         if (ptr == NULL) {
-            psAbort(__func__, "Failed to reallocate %ld bytes at %s:%d", size, file, lineno);
+            psAbort(__func__, "Failed to reallocate %zd bytes at %s:%d", size, file, lineno);
         }
     }

trunk/psLib/src/sys/psTrace.h

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-17 01:39:03 $
+ *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -89 +89 @@
 );
 
-#else
+#else // DOXYGEN
+#ifdef __GNUC__
 /// Send a trace message
 void p_psTrace(
@@ -99 +100 @@
     const char *format,                ///< printf-style format command
     ...                                ///< trace message arguments
+) __attribute__((format(printf, 6, 7)));
+#else // __GNUC__
+void p_psTrace(
+    const char* file,                  ///< file name
+    int lineno,                        ///< line number in file
+    const char* func,                  ///< function name
+    const char *facil,                 ///< facilty of interest
+    psS32 level,                       ///< desired trace level
+    const char *format,                ///< printf-style format command
+    ...                                ///< trace message arguments
 );
-
+#endif // __GNUC__
 #ifndef SWIG
 #define psTrace(facil, level, ...) p_psTrace(__FILE__,__LINE__,__func__,facil, level, __VA_ARGS__)
@@ -110 +121 @@
     va_list ap                         ///< varargs argument list
 );
-
 #endif /* SWIG */
-
 #endif /* DOXYGEN */
 

trunk/psLib/src/types/psArguments.c

@@ -7 +7 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:26:44 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -304 +304 @@
         case PS_DATA_STRING:
             if (item->data.V) {
-                printf("""%s""", (char*)(item->data.V));
+                printf("""%s""", item->data.str);
             }
             break;

trunk/psLib/src/types/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-25 05:26:19 $
+ *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -215 +215 @@
         if (position >= array->nalloc) {
             psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                    _("Specified position, %d, is greater than the allocated size of the array, %d."),
+                    _("Specified position, %ld, is greater than the allocated size of the array, %ld."),
                     position, array->nalloc);
             return false;

trunk/psLib/src/types/psBitSet.c

@@ -11 +11 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -82 +82 @@
     if (nalloc < 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("The number of bit in a psBitSet (%d) must be greater than zero."),
+                _("The number of bit in a psBitSet (%ld) must be greater than zero."),
                 nalloc);
         return NULL;
@@ -113 +113 @@
                 (bit > bitSet->n * 8 - 1) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("The specified bit position (%d) is invalid.  Position must be between 0 and %d."),
-                bit,bitSet->n * 8 - 1);
+                _("The specified bit position (%ld) is invalid.  Position must be between 0 and %ld."),
+                bit, bitSet->n * 8 - 1);
         return bitSet;
     }
@@ -136 +136 @@
                 (bit > bitSet->n * 8 - 1) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("The specified bit position (%d) is invalid.  Position must be between 0 and %d."),
-                bit,bitSet->n * 8 - 1);
+                _("The specified bit position (%ld) is invalid.  Position must be between 0 and %ld."),
+                bit, bitSet->n * 8 - 1);
         return bitSet;
     }
@@ -159 +159 @@
                 (bit > bitSet->n * 8 - 1) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("The specified bit position (%d) is invalid.  Position must be between 0 and %d."),
+                _("The specified bit position (%ld) is invalid.  Position must be between 0 and %ld."),
                 bit,bitSet->n * 8 - 1);
         return false;

trunk/psLib/src/types/psHash.c

@@ -12 +12 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-09 02:26:44 $
+*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-26 04:34:28 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 #include <stdio.h>
 #include <string.h>
+#include <inttypes.h>
+
 #include "psHash.h"
 #include "psMemory.h"
@@ -148 +150 @@
     table->n = nalloc;
 
-    psTrace("psLib.types", 1, "Creating %d-element hash table\n", nalloc);
+    psTrace("psLib.types", 1, "Creating %ld-element hash table\n", nalloc);
 
     // Initialize all buckets to NULL.
@@ -260 +262 @@
     if ((hash < 0) || (hash >= table->n)) {
         psError(PS_ERR_UNKNOWN, true,
-                "Internal hash function out of range (%d)", hash);
+                "Internal hash function out of range (%" PRId64 ")", hash);
     }
     // ptr will have the correct hash bucket.

trunk/psLib/src/types/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -206 +206 @@
     if (location < 0 || location >= (int)list->n) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("Specified location, %d, is invalid."),
+                _("Specified location, %ld, is invalid."),
                 location);
         return false;
@@ -260 +260 @@
     if (location > 0 && location >= (int)list->n) {
         psLogMsg(__func__,PS_LOG_WARN,
-                 "Specified location, %d, is beyond the end of the list.  "
+                 "Specified location, %ld, is beyond the end of the list.  "
                  "Adding data item to tail.",
                  location);
@@ -485 +485 @@
     if (! psListIteratorSet(iterator,location)) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("Specified location, %d, is invalid."),
+                _("Specified location, %ld, is invalid."),
                 location);
         return NULL;

trunk/psLib/src/types/psLookupTable.c

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-23 01:56:15 $
+*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-26 04:34:28 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -20 +20 @@
 #include <limits.h>
 #include <math.h>
+#include <inttypes.h>
 
 #include "psMemory.h"
@@ -593 +594 @@
 
     if (indexCol >= vectors->n) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE,true,"Index column, %d, is larger than number of columns, %d.",
+        psError(PS_ERR_BAD_PARAMETER_VALUE,true,"Index column, %ld, is larger than number of columns, %ld.",
                 indexCol, vectors->n);
         return NULL;
@@ -814 +815 @@
         if(hiIdx >= numRows) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    _("High index too big, %d."), hiIdx);
+                    _("High index too big, %" PRIu64 "."), hiIdx);
             return NAN;
         }
@@ -824 +825 @@
     if(loIdx < 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("Low index too small, %d."), loIdx);
+                _("Low index too small, %" PRIu64 "."), loIdx);
         return NAN;
     }

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.128 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-25 22:10:35 $
+ *  @version $Revision: 1.129 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -733 +733 @@
         if (entry == NULL) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    _("Could not find metadata item at index %d."), where);
+                    _("Could not find metadata item at index %ld."), where);
             return false;
         }
@@ -740 +740 @@
         if (key == NULL) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    _("Failed to remove metadata item, at index %d, from metadata list."),
+                    _("Failed to remove metadata item, at index %ld, from metadata list."),
                     where);
             return false;
@@ -959 +959 @@
         }
         if (!psMetadataIteratorSet(newIter, location)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to set location=%d for metadata iterator.\n", location);
+            psError(PS_ERR_UNKNOWN, false, "Unable to set location=%ld for metadata iterator.\n", location);
             psFree(newIter);
             return NULL;
@@ -1229 +1229 @@
         switch (item->type) {
         case PS_DATA_STRING:
-            fprintf(fd, "%s\n", (char*)(item->data.V));
+            fprintf(fd, "%s\n", item->data.str);
             break;
         case PS_DATA_BOOL:

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-26 00:32:39 $
+*  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-26 04:34:28 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -539 +539 @@
     case 's':
         if (type == PS_DATA_STRING) {
-            fprintf(fd,format,(char*)item->data.V);
+            fprintf(fd,format, item->data.str);
         } else {
             psError(PS_ERR_BAD_PARAMETER_TYPE,true,
@@ -1010 +1010 @@
         break;
     default:
-        psError(PS_ERR_IO,true,_("Metadata type '%s', found on line %u of %s, is invalid."),
+        psError(PS_ERR_IO,true,_("Metadata of unknown type found on line %u of %s."),
                 lineCount,fileName);
         break;
@@ -1346 +1346 @@
     case PS_DATA_STRING:
         psStringAppend(&content, "%-15s  %-8s", item->name, "STR");
-        psStringAppend(&content, "  %s", ((char *)(item->data.V)));
+        psStringAppend(&content, "  %s", item->data.str);
         if ( strncmp(item->comment,"",2) ) {
             psStringAppend(&content, " #%s", item->comment);

trunk/psLib/src/types/psMetadataItemCompare.c

@@ -67 +67 @@
             return false;
         }
-        psTrace("psLib.types", 10, "Comparing '%s' with '%s'\n", compare->data.V, template->
-                data.V);
+        psTrace("psLib.types", 10, "Comparing '%s' with '%s'\n",
+                compare->data.str, template->
+                data.str);
         return (strcasecmp(compare->data.V, template->
                            data.V) == 0) ? true : false;

trunk/psLib/src/xml/psXML.c

@@ -10 +10 @@
 *  @author David Robbins, MHPCC
 *
-*  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-08 23:32:23 $
+*  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-26 04:34:28 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -105 +105 @@
             prop = xmlNewProp(cur_node, (const xmlChar*)"name", (const xmlChar*)item->name);
             prop = xmlNewProp(cur_node, (const xmlChar*)"psType", (const xmlChar*)"STR");
-            strncpy(content, ((char *)(item->data.V)), MAXSTR);
+            strncpy(content, item->data.str, MAXSTR);
             prop = xmlNewProp(cur_node, (const xmlChar*)"value", (const xmlChar*)content);
             break;