Changeset 14682

Timestamp:

Aug 27, 2007, 4:55:51 PM (19 years ago)

Author:

jhoblitt

Message:

fix PS_ASSERT_PTR() to be called on ptr not &ptr

Location:

trunk/psLib/src/sys

Files:

• psAssert.h (modified) (1 diff)
• psString.c (modified) (5 diffs)

trunk/psLib/src/sys/psAssert.h

@@ -23 +23 @@
 #define PS_ASSERT_PTR(PTR, RVAL) \
 { \
-    if (PTR == NULL) return RVAL; \
-    if (!psMemIsAlloced(PTR)) { \
+    if (PTR && (!psMemIsAlloced(PTR))) { \
         psError(PS_ERR_MEMORY_CORRUPTION, false, \
             "Error: Pointer %p is corrupted or not on the PS memory system.", \

trunk/psLib/src/sys/psString.c

@@ -13 +13 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-08-27 23:24:21 $
+ *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-08-28 02:55:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -121 +121 @@
 {
     PS_ASSERT_PTR_NON_NULL(dest, 0);
-    PS_ASSERT_PTR(dest, 0);
+    PS_ASSERT_PTR(*dest, 0);
     PS_ASSERT_STRING_NON_EMPTY(format, 0);
 
@@ -140 +140 @@
 {
     PS_ASSERT_PTR_NON_NULL(dest, 0);
-    PS_ASSERT_PTR(dest, 0);
+    PS_ASSERT_PTR(*dest, 0);
     PS_ASSERT_STRING_NON_EMPTY(format, 0);
 
@@ -194 +194 @@
 {
     PS_ASSERT_PTR_NON_NULL(dest, 0);
-    PS_ASSERT_PTR(dest, 0);
+    PS_ASSERT_PTR(*dest, 0);
     PS_ASSERT_STRING_NON_EMPTY(format, 0);
 
@@ -214 +214 @@
 {
     PS_ASSERT_PTR_NON_NULL(dest, 0);
-    PS_ASSERT_PTR(dest, 0);
+    PS_ASSERT_PTR(*dest, 0);
     PS_ASSERT_STRING_NON_EMPTY(format, 0);