Changeset 3085 for trunk/psLib/src/collections/psList.c

Timestamp:

Jan 24, 2005, 3:04:17 PM (21 years ago)

Author:

evanalst

Message:

Update psListGetNext to come back onto list.

File:

• trunk/psLib/src/collections/psList.c (modified) (3 diffs)

trunk/psLib/src/collections/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-25 00:12:12 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-25 01:04:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -495 +495 @@
 psPtr psListGetNext(psListIterator* iterator)
 {
-    if (iterator == NULL || iterator->cursor == NULL) {
+    if (iterator == NULL ) {
+        return NULL;
+    }
+    if (( iterator->cursor == NULL) && (iterator->offEnd)) {
+        return NULL;
+    }
+    if ( (iterator->cursor == NULL) && (!iterator->offEnd)) {
+        iterator->cursor = iterator->list->head;
+        iterator->index = 0;
         return NULL;
     }
@@ -512 +520 @@
 psPtr psListGetPrevious(psListIterator* iterator)
 {
-    if ( (iterator == NULL ) || ((iterator->cursor == NULL) && (!iterator->offEnd)) ) {
+    if (iterator == NULL ) {
+        return NULL;
+    }
+    if ((iterator->cursor == NULL) && (!iterator->offEnd))  {
+        psLogMsg(__func__,PS_LOG_WARN,"Attempt to get previous with itertator cursor NULL and offEnd false");
         return NULL;
     }