Changeset 3082

Timestamp:

Jan 24, 2005, 2:12:12 PM (21 years ago)

Author:

evanalst

Message:

Allow function psListGetPrevious to come back onto the list after
psListGetNext has gone beyond the end.

Location:

trunk/psLib/src

Files:

• collections/psList.c (modified) (2 diffs)
• types/psList.c (modified) (2 diffs)

trunk/psLib/src/collections/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-20 00:51:29 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-25 00:12:12 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -512 +512 @@
 psPtr psListGetPrevious(psListIterator* iterator)
 {
-    if (iterator == NULL || iterator->cursor == NULL) {
+    if ( (iterator == NULL ) || ((iterator->cursor == NULL) && (!iterator->offEnd)) ) {
+        return NULL;
+    }
+    if ( (iterator->cursor == NULL) && (iterator->offEnd) ) {
+        iterator->cursor = iterator->list->tail;
+        iterator->index = iterator->list->size-1;
+        iterator->offEnd = false;
         return NULL;
     }

trunk/psLib/src/types/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-20 00:51:29 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-25 00:12:12 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -512 +512 @@
 psPtr psListGetPrevious(psListIterator* iterator)
 {
-    if (iterator == NULL || iterator->cursor == NULL) {
+    if ( (iterator == NULL ) || ((iterator->cursor == NULL) && (!iterator->offEnd)) ) {
+        return NULL;
+    }
+    if ( (iterator->cursor == NULL) && (iterator->offEnd) ) {
+        iterator->cursor = iterator->list->tail;
+        iterator->index = iterator->list->size-1;
+        iterator->offEnd = false;
         return NULL;
     }