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

Timestamp:

Sep 28, 2004, 1:26:49 PM (22 years ago)

Author:

desonia

Message:

changed function prototypes to match changes in the SDRS.

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.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-14 20:01:52 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-28 23:26:48 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21 +21 @@
 /******************************************************************************/
 #include<stdlib.h>                         // for qsort, etc.
+#include<string.h>
 
 #include "psMemory.h"
@@ -58 +59 @@
 }
 
-psArray* psArrayRealloc(unsigned int nalloc, psArray* restrict in)
+psArray* psArrayRealloc(psArray* restrict in, unsigned int nalloc)
 {
     if (in == NULL) {
@@ -88 +89 @@
 }
 
+bool psArrayRemove(psArray* psArr,
+                   psPTR data)
+{
+    bool success = false;
+
+    if (psArr == NULL) {
+        return success;
+    }
+
+    int n = psArr->n;
+    psPTR* psArrData = psArr->data;
+    for (int i = n-1; i<0; i--) {
+        if (psArrData[i] == data) {
+            memmove(psArrData[i],psArrData[i+1],(n-i-1)*sizeof(psPTR));
+            n--;
+            success = true;
+        }
+    }
+    psArr->n = n; // reset the array size to indicate the removed item(s)
+
+    return success;
+}
+
 void psArrayElementFree(psArray* restrict psArr)
 {