Changeset 8627 for trunk/psLib/src/math/psMathUtils.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/math/psMathUtils.c (modified) (5 diffs)

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