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

Timestamp:

Jul 5, 2005, 5:04:35 PM (21 years ago)

Author:

drobbin

Message:

made changes based on revisions in psLib SDRS rev. 15

File:

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

trunk/psLib/src/collections/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-25 02:02:05 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-06 03:04:35 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -113 +113 @@
     }
 
-    list->size--;
+    list->n--;
 
     pthread_mutex_unlock(&list->lock)
@@ -131 +131 @@
     psMemSetDeallocator(list, (psFreeFunc) listFree);
 
-    list->size = 0;
+    list->n = 0;
     list->head = list->tail = NULL;
     list->iterators = psArrayAlloc(16);
@@ -182 +182 @@
 
 bool psListIteratorSet(psListIterator* iterator,
-                       int location)
+                       long location)
 {
     if (iterator == NULL) {
@@ -192 +192 @@
     if (location == PS_LIST_TAIL) {
         iterator->cursor = list->tail;
-        iterator->index = list->size - 1;
+        iterator->index = list->n - 1;
         iterator->offEnd = false;
         return true;
@@ -205 +205 @@
 
     if (location < 0) {
-        location = list->size + location;
-    }
-
-    if (location < 0 || location >= (int)list->size) {
+        location = list->n + location;
+    }
+
+    if (location < 0 || location >= (int)list->n) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 PS_ERRORTEXT_psList_LOCATION_INVALID,
@@ -218 +218 @@
     int index = iterator->index;
     if (cursor == NULL) {      // set the cursor to the head if it is NULL
-        if (location > list->size/2) { // closer to tail or head?
+        if (location > list->n/2) { // closer to tail or head?
             cursor = list->tail;
-            index = list->size - 1;
+            index = list->n - 1;
         } else {
             cursor = list->head;
@@ -262 +262 @@
     }
 
-    if (location > 0 && location >= (int)list->size) {
+    if (location > 0 && location >= (int)list->n) {
         psLogMsg(__func__,PS_LOG_WARN,
                  "Specified location, %d, is beyond the end of the list.  "
@@ -337 +337 @@
     elem->data = psMemIncrRefCounter(data);
 
-    list->size++;
+    list->n++;
 
     if (cursor == list->tail) {
@@ -412 +412 @@
     elem->data = psMemIncrRefCounter(data);
 
-    list->size++;
+    list->n++;
 
     if (cursor == list->head) {
@@ -548 +548 @@
     if ( (iterator->cursor == NULL) && (iterator->offEnd) ) {
         iterator->cursor = iterator->list->tail;
-        iterator->index = iterator->list->size-1;
+        iterator->index = iterator->list->n-1;
         iterator->offEnd = false;
         return NULL;
@@ -574 +574 @@
     }
 
-    if (list->size > 0) {
-        arr = psArrayAlloc(list->size);
+    if (list->n > 0) {
+        arr = psArrayAlloc(list->n);
     } else {
         arr = psArrayAlloc(1);
     }
 
-    arr->n = list->size;
+    arr->n = list->n;
 
     ptr = list->head;
-    n = list->size;
+    n = list->n;
     for (psS32 i = 0; i < n; i++) {
         arr->data[i] = psMemIncrRefCounter(ptr->data);