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

Timestamp:

Sep 8, 2004, 4:23:27 PM (22 years ago)

Author:

desonia

Message:

changed order of psListAdd/psListRemove to match current SDRS.

File:

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

trunk/psLib/src/collections/psList.c

@@ -7 +7 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-28 03:00:16 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-09 02:23:27 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -49 +49 @@
 
     if (data != NULL) {
-        psListAdd(list, data, PS_LIST_TAIL);
+        psListAdd(list, PS_LIST_TAIL, data);
     }
 
@@ -81 +81 @@
 }
 
-bool psListAdd(psList* list, void *data, int where)
+bool psListAdd(psList* list, int location, void *data)
 {
     psListElem* position;
@@ -95 +95 @@
     }
 
-    if (where <= PS_LIST_UNKNOWN) {
+    if (location <= PS_LIST_UNKNOWN) {
         // / XXX What is the better way to communicate this failure to the caller?
-        psLogMsg(__func__, PS_LOG_WARN, "The given insert location (%i) for psListAdd is invalid.", where);
+        psLogMsg(__func__, PS_LOG_WARN, "The given insert location (%i) for psListAdd is invalid.", location);
         return false;
     }
@@ -106 +106 @@
     ;
 
-    if (where > 0 && where > list->size) {
+    if (location > 0 && location > list->size) {
         psLogMsg(__func__, PS_LOG_WARN,
-                 "Invalid index %d (only %d elements in psList); assuming tail.", where, list->size);
-        where = PS_LIST_TAIL;
-    }
-
-    if (where == PS_LIST_TAIL || list->size == 0) {
+                 "Invalid index %d (only %d elements in psList); assuming tail.", location, list->size);
+        location = PS_LIST_TAIL;
+    }
+
+    if (location == PS_LIST_TAIL || list->size == 0) {
         // insert the element at the end of the list
         elem->prev = list->tail;
@@ -131 +131 @@
     } else {
         // move ourselves to the given position
-        listSetIterator(list, where, false);
+        listSetIterator(list, location, false);
         position = listGetIterator(list);
         cursorIndex = listGetIteratorIndex(list);
 
         if (position == NULL) {
-            psError(__func__, "%s failed to move cursor to specified location (%d)", __func__, where);
+            psError(__func__, "%s failed to move cursor to specified location (%d)", __func__, location);
             position = list->head;         // since we no list->size != 0, this must be non-NULL
         }
@@ -163 +163 @@
 }
 
-/*****************************************************************************/
 
 /*
  * Remove an element from a list
  */
-bool psListRemove(psList* list, void *data, int which)
+bool psListRemove(psList* list, int location, void *data)
 {
     psListElem* elem = NULL;    // element to remove
@@ -181 +180 @@
     ;
 
-    if (which == PS_LIST_UNKNOWN) {
+    if (location == PS_LIST_UNKNOWN) {
         // search list for the data item.
 
@@ -188 +187 @@
         for (psListElem* ptr = list->head; ptr != NULL; ptr = ptr->next) {
             if (ptr->data == data) {
-                which = i;
+                location = i;
                 break;
             }
@@ -194 +193 @@
         }
 
-        if (which == PS_LIST_UNKNOWN) {
+        if (location == PS_LIST_UNKNOWN) {
             psError(__func__, "Failed to find item in given psList.");
             pthread_mutex_unlock(&list->lock)
@@ -202 +201 @@
     }
     // position the list's cursor to the desired location
-    listSetIterator(list, which, false);
+    listSetIterator(list, location, false);
     elem = listGetIterator(list);
     cursorIndex = listGetIteratorIndex(list);
 
     if (elem == NULL) {
-        psError(__func__, "Couldn't position to given index (%d) to remove element from list.", which);
+        psError(__func__, "Couldn't position to given index (%d) to remove element from list.", location);
         pthread_mutex_unlock(&list->lock)
         ;
@@ -374 +373 @@
 }
 
-void *psListGet(psList* list, int which)
+void *psListGet(psList* list, int location)
 {
     psListElem* element;
 
-    psListSetIterator(list, which);
+    psListSetIterator(list, location);
     element = listGetIterator(list);
 
@@ -449 +448 @@
     n = arr->n;
     for (int i = 0; i < n; i++) {
-        psListAdd(list, arr->data[i], PS_LIST_TAIL);
+        psListAdd(list, PS_LIST_TAIL, arr->data[i]);
     }