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

Timestamp:

Dec 22, 2004, 3:14:52 PM (22 years ago)

Author:

desonia

Message:

added psArrayAdd function.

File:

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

trunk/psLib/src/collections/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-19 00:33:39 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-23 01:14:52 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -36 +36 @@
 /*****************************************************************************/
 static void arrayFree(psArray* restrict psArr);
+
+static void arrayFree(psArray* restrict psArr)
+{
+    if (psArr == NULL) {
+        return;
+    }
+
+    psArrayElementFree(psArr);
+
+    psFree(psArr->data);
+}
 
 /*****************************************************************************/
@@ -79 +90 @@
 }
 
-static void arrayFree(psArray* restrict psArr)
+psArray* psArrayAdd(psArray* psArr,
+                    int delta,
+                    psPtr data)
 {
     if (psArr == NULL) {
-        return;
+        return psArr;
     }
 
-    psArrayElementFree(psArr);
+    int n = psArr->n;
 
-    psFree(psArr->data);
+    if (n >= psArr->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);
+    }
+
+    // add the element to the end of the array.
+    psArr->data[n] = data;
+    psArr->n = n+1;
+
+    return psArr;
 }
 
@@ -95 +118 @@
     psBool success = false;
 
-    if (psArr == NULL) {
-        return success;
-    }
 
     psS32 n = psArr->n;