Changeset 4312 for trunk/psLib/src/collections/psArray.c

Timestamp:

Jun 17, 2005, 2:53:32 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

File:

• trunk/psLib/src/collections/psArray.c (modified) (3 diffs)

trunk/psLib/src/collections/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 23:39:51 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -86 +86 @@
 }
 
-psArray* psArrayAdd(psArray* psArr,
-                    int delta,
+psArray* psArrayAdd(psArray* array,
+                    long delta,
                     psPtr data)
 {
-    if (psArr == NULL) {
-        return psArr;
-    }
-
-    int n = psArr->n;
-
-    if (n >= psArr->nalloc) {
+    if (array == NULL) {
+        return array;
+    }
+
+    int n = array->n;
+
+    if (n >= array->nalloc) {
         // array needs to be expanded to make room for more elements
         int d = (delta > 0) ? delta : 10; // as spec'ed in SDRS.
-        psArr = psArrayRealloc(psArr, n+d);
+        array = psArrayRealloc(array, n+d);
     }
 
     // add the element to the end of the array.
-    psArr->data[n] = psMemIncrRefCounter(data);
-    psArr->n = n+1;
-
-    return psArr;
+    array->data[n] = psMemIncrRefCounter(data);
+    array->n = n+1;
+
+    return array;
 }
 
@@ -147 +147 @@
 }
 
-psArray* psArraySort(psArray* in, psComparePtrFcn compare)
-{
-    if (in == NULL) {
-        return NULL;
-    }
-
-    qsort(in->data, in->n, sizeof(psPtr), (int (*)(const void* , const void*))compare);
-
-    return in;
+psArray* psArraySort(psArray* array, psComparePtrFcn func)
+{
+    if (array == NULL) {
+        return NULL;
+    }
+
+    qsort(array->data, array->n, sizeof(psPtr), (int (*)(const void* , const void*))func);
+
+    return array;
 }