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

Timestamp:

Jun 29, 2004, 1:19:11 PM (22 years ago)

Author:

desonia

Message:

added psListSort function and fixed psListRemove to match the new SDRS (i,e.,
the function now returns a bool instead of a void*).

File:

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

trunk/psLib/src/collections/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-28 20:36:37 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-29 23:19:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -176 +176 @@
  * Remove an element from a list
  */
-void *psListRemove(psList *list, void *data,  int which)
+bool psListRemove(psList *list, void *data,  int which)
 {
     psListElem *elem = NULL;  // element to remove
@@ -183 +183 @@
     if (list == NULL) {
         psError(__func__,"list parameter found to be NULL in %s",__func__);
-        return NULL;
+        return false;
     }
 
@@ -204 +204 @@
         if (which == PS_LIST_UNKNOWN) {
             psError(__func__, "Failed to find item in given psList.");
-            return NULL;
+            return false;
         }
     }
@@ -215 +215 @@
     if (elem == NULL) {
         psError(__func__, "Couldn't position to given index (%d) to remove element from list.",which);
-        return NULL;
+        return false;
     }
 
@@ -245 +245 @@
     ;
 
-    /*
-     * OK, delete list element and return the data
-     */
-    data = elem->data;
+    // OK, delete list element and its data
+    psFree(elem->data);
     psFree(elem);
-    return data;
+
+    return true;
 }
 
@@ -460 +459 @@
 
 
-psList* psListSort(psList* list, psCompareFcn compare)
+psList* psListSort(psList* list, psComparePtrFcn compare)
 {
     psVector* vector;
@@ -476 +475 @@
     // convert back to linked list
     list = psVectorToList(vector);
+    psFree(vector);
 
     return list;