Changeset 12596

Timestamp:

Mar 27, 2007, 8:51:23 AM (19 years ago)

Author:

magnier

Message:

adding a generic PS_ASSERT macro to catch known programming errors

Location:

trunk/psLib/src

Files:

• psErrorCodes_en.dat (modified) (1 diff)
• sys/psAssert.h (modified) (2 diffs)

trunk/psLib/src/psErrorCodes_en.dat

@@ -20 +20 @@
 BAD_FITS                       file doesn't obey FITS standard
 IEEE                           a NaN or Inf was detected
-DB_CLIENT                       Database error originated in the client library
-DB_SERVER                       Database error generated by the server
+DB_CLIENT                      Database error originated in the client library
+DB_SERVER                      Database error generated by the server
+PROGRAMMING                    Known programming error

trunk/psLib/src/sys/psAssert.h

@@ -12 +12 @@
 #include "psError.h"
 #include "psLogMsg.h"
+
+// these two asserts can be used in the middle of a function to test for programming errors
+#define PS_ASSERT(VAR, RVAL) \
+if (!(VAR)) { \
+    psError(PS_ERR_PROGRAMMING, false, "Error: %s is not true.", #VAR); \
+    return(RVAL); \
+}
 
 // Ensure this is a psLib pointer, by checking for the memblock bounds.
@@ -35 +42 @@
 }
 
+#define PS_ASSERT_INT_UNEQUAL(NAME1, NAME2, RVAL) \
+if ((NAME1) == (NAME2)) { \
+    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+            "Error: %s and %s are equal.", \
+            #NAME1, #NAME2); \
+    return(RVAL); \
+}
+
 #define PS_ASSERT_INT_EQUAL(NAME1, NAME2, RVAL) \
 if ((NAME1) != (NAME2)) { \