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

Timestamp:

Feb 2, 2005, 10:22:22 AM (21 years ago)

Author:

evanalst

Message:

Update changes to psList.

File:

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

trunk/psLib/src/collections/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-25 01:04:17 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-02 20:21:48 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -137 +137 @@
 
     // create a default iterator
-    psListIteratorAlloc(list,PS_LIST_HEAD);
+    psListIteratorAlloc(list,PS_LIST_HEAD,true);
 
     pthread_mutex_init(&(list->lock), NULL)
@@ -149 +149 @@
 }
 
-psListIterator* psListIteratorAlloc(psList* list, int location)
+psListIterator* psListIteratorAlloc(psList* list, int location, bool mutable)
 {
     psListIterator* iter = psAlloc(sizeof(psListIterator));
@@ -160 +160 @@
     iter->index = 0;
     iter->offEnd = false;
+    iter->mutable = mutable;
 
     // add to the list's array of iterators
@@ -201 +202 @@
         iterator->offEnd = false;
         return true;
+    }
+
+    if (location < 0) {
+        location = list->size + location;
     }
 
@@ -289 +294 @@
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psList_ITERATOR_NULL);
+        return false;
+    }
+
+    // Check if the list pointed by the iterator can be changed
+    if (!iterator->mutable) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psList_ITERATOR_NONMUTABLE);
         return false;
     }
@@ -360 +372 @@
     }
 
+    // Check if the list pointed by the iterator can be changed
+    if (!iterator->mutable) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psList_ITERATOR_NONMUTABLE);
+        return false;
+    }
+
     psListElem* cursor = iterator->cursor;
     psList* list = iterator->list;
@@ -493 +512 @@
  * and now return the previous/next element of the list
  */
-psPtr psListGetNext(psListIterator* iterator)
+psPtr psListGetAndIncrement(psListIterator* iterator)
 {
     if (iterator == NULL ) {
@@ -518 +537 @@
 }
 
-psPtr psListGetPrevious(psListIterator* iterator)
+psPtr psListGetAndDecrement(psListIterator* iterator)
 {
     if (iterator == NULL ) {