Changeset 12303

Timestamp:

Mar 7, 2007, 4:13:31 PM (19 years ago)

Author:

Paul Price

Message:

Fixing some assertions that had <= instead of <

Location:

trunk/psLib/src/types

Files:

• psArray.h (modified) (2 diffs)
• psHash.h (modified) (2 diffs)
• psList.c (modified) (2 diffs)
• psList.h (modified) (3 diffs)

trunk/psLib/src/types/psArray.h

@@ -10 +10 @@
  *  @author Joshua Hoblitt, University of Hawaii
  *
- *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-08 03:34:09 $
+ *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-08 02:13:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -242 +242 @@
 #define PS_ASSERT_ARRAY_NON_NULL(NAME, RETURNVAL) PS_ASSERT_GENERAL_ARRAY_NON_NULL(NAME, return RETURNVAL)
 #define PS_ASSERT_GENERAL_ARRAY_NON_NULL(NAME, CLEANUP) \
-if ((NAME) == NULL || (NAME)->data == NULL) { \
+if ((NAME) == NULL || (NAME)->data == NULL || (NAME)->n < 0) { \
     psError(PS_ERR_BAD_PARAMETER_NULL, true, \
             "Unallowable operation: psArray %s or its data is NULL.", \

trunk/psLib/src/types/psHash.h

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-07 02:50:15 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-08 02:13:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -114 +114 @@
 
 #define PS_ASSERT_HASH_NON_NULL(NAME, RVAL) \
-if (!(NAME) || !(NAME)->buckets || (NAME)->n <= 0) { \
+if (!(NAME) || !(NAME)->buckets || (NAME)->n < 0) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
             "Error: Hash %s or one of its components is NULL.", \

trunk/psLib/src/types/psList.c

@@ -7 +7 @@
  *  @author Joshua Hoblitt, University of Hawaii
  *
- *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-07 02:50:15 $
+ *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-08 02:13:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -258 +258 @@
     PS_ASSERT_PTR_NON_NULL(data, false);
 
-    if (location > 0 && location >= (int)list->n) {
+    if (location >= list->n) {
         psLogMsg(__func__,PS_LOG_WARN,
                  "Specified location, %ld, is beyond the end of the list.  "

trunk/psLib/src/types/psList.h

@@ -5 +5 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-07 02:50:15 $
+ *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-08 02:13:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -276 +276 @@
 
 #define PS_ASSERT_LIST_NON_NULL(NAME, RVAL) \
-if (!(NAME) || !(NAME)->iterators || (NAME)->n <= 0) { \
+if (!(NAME) || !(NAME)->iterators || (NAME)->n < 0) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
             "Error: List %s or one of its components is NULL.", \
@@ -284 +284 @@
 
 #define PS_ASSERT_LIST_ITERATOR_NON_NULL(NAME, RVAL) \
-if (!(NAME) || !(NAME)->list || !(NAME)->list->iterators || (NAME)->list->n <= 0 || \
+if (!(NAME) || !(NAME)->list || !(NAME)->list->iterators || (NAME)->list->n < 0 || \
     (!(NAME)->cursor && (NAME)->list->head) || (NAME)->index <= 0) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \