Changeset 8627 for trunk/psLib/src/sys/psAssert.h

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/sys/psAssert.h (modified) (2 diffs)

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