Changeset 1193 for trunk/psLib/src/collections

Timestamp:

Jul 7, 2004, 3:05:01 PM (22 years ago)

Author:

desonia

Message:

rewrote psImageCopy so that macro need not be expanded.

Location:

trunk/psLib/src/collections

Files:

• psList.c (modified) (5 diffs)
• psList.h (modified) (2 diffs)

trunk/psLib/src/collections/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-29 23:19:11 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-08 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -80 +80 @@
 }
 
-psList* psListAdd(psList *list, void *data, int where)
+bool psListAdd(psList *list, void *data, int where)
 {
     psListElem* position;
@@ -87 +87 @@
 
     if (list == NULL) {
-        return NULL;
+        return false;
     }
 
     if (data == NULL) {
-        return list;
-    }
-    elem = psAlloc(sizeof(psListElem));
-
-    pthread_mutex_lock(&list->lock)
-    ;
+        return false;
+    }
 
     if (where <= 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. Adding to head instead.",
+                 "The given insert location (%i) for psListAdd is invalid.",
                  where);
-        where = PS_LIST_HEAD; // given I can't tell caller about this, should just add it somewhere???
-    }
+        return false;
+    }
+
+    elem = psAlloc(sizeof(psListElem));
+
+    pthread_mutex_lock(&list->lock)
+    ;
 
     if (where > 0 && where > list->size) {
@@ -162 +163 @@
     ;
 
-    return list;
-}
-
-/*****************************************************************************/
-
-psList *psListAppend(psList *list, void *data)
-{
-    return psListAdd(list, data, PS_LIST_TAIL);
+    return true;
 }
 
@@ -452 +446 @@
     n = arr->n;
     for (int i = 0; i < n; i++) {
-        psListAppend(list,arr->data.PTR[i]);
+        psListAdd(list,arr->data.PTR[i],PS_LIST_TAIL);
     }
 

trunk/psLib/src/collections/psList.h

@@ -10 +10 @@
  *  @ingroup LinkedList
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-29 23:19:11 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-08 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -81 +81 @@
  *                      NULL, the return value will also be NULL.
  */
-psList* psListAdd(
+bool psListAdd(
     psList* restrict list,              ///< list to add to (if NULL, nothing is done)
     void* data,                         ///< data item to add.  If NULL, list is not modified.
     int where                           ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location.
-);
-
-/** Appends an item to a psList.
- *
- *  @return psList*     The psList with added data item.  If list parameter is
- *                      NULL, the return value will also be NULL.
- */
-psList* psListAppend(
-    psList* restrict list,              ///< list to append to (if NULL, nothing is done)
-    void *data                          ///< data item to add. If NULL, list is not modified.
 );