Changeset 12309

Timestamp:

Mar 7, 2007, 5:59:12 PM (19 years ago)

Author:

Paul Price

Message:

Backing off some assertion parameters that were only present in the add functions.

Location:

trunk/psLib/src/types

Files:

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

trunk/psLib/src/types/psList.c

@@ -7 +7 @@
  *  @author Joshua Hoblitt, University of Hawaii
  *
- *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-08 02:13:31 $
+ *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-08 03:59:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -294 +294 @@
     psListElem* cursor = iterator->cursor;
     psList* list = iterator->list;
+
+    if (cursor == NULL && list->head != NULL) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                _("Specified iterator is not valid."));
+        return false;
+    }
 
     psListElem* elem = psAlloc(sizeof(psListElem));
@@ -345 +351 @@
     psListElem* cursor = iterator->cursor;
     psList* list = iterator->list;
+
+    if (cursor == NULL && list->head != NULL) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                _("Specified iterator is not valid."));
+        return false;
+    }
+
     psListElem* elem = psAlloc(sizeof(psListElem));
 

trunk/psLib/src/types/psList.h

@@ -5 +5 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-08 03:51:11 $
+ *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-08 03:59:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -284 +284 @@
 
 #define PS_ASSERT_LIST_ITERATOR_NON_NULL(NAME, RVAL) \
-if (!(NAME) || !(NAME)->list || !(NAME)->list->iterators || (NAME)->list->n < 0 || \
-    (!(NAME)->cursor && (NAME)->list->head)) { \
+if (!(NAME) || !(NAME)->list || !(NAME)->list->iterators || (NAME)->list->n < 0) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
             "Error: List iterator %s or one of its components is NULL.", \