Changeset 2384

Timestamp:

Nov 18, 2004, 2:33:39 PM (22 years ago)

Author:

evanalst

Message:

Fix psArrayRemove function to work correctly.

Location:

trunk/psLib/src

Files:

• collections/psArray.c (modified) (2 diffs)
• types/psArray.c (modified) (2 diffs)

trunk/psLib/src/collections/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-12 22:29:41 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-19 00:33:39 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -101 +101 @@
     psS32 n = psArr->n;
     psPtr* psArrData = psArr->data;
-    for (psS32 i = n-1; i<0; i--) {
+    for (psS32 i = n-1; i >= 0; i--) {
         if (psArrData[i] == data) {
-            memmove(psArrData[i],psArrData[i+1],(n-i-1)*sizeof(psPtr));
+            memmove(&psArr->data[i],&psArr->data[i+1],(n-i-1)*sizeof(psPtr));
             n--;
             success = true;

trunk/psLib/src/types/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-12 22:29:41 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-19 00:33:39 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -101 +101 @@
     psS32 n = psArr->n;
     psPtr* psArrData = psArr->data;
-    for (psS32 i = n-1; i<0; i--) {
+    for (psS32 i = n-1; i >= 0; i--) {
         if (psArrData[i] == data) {
-            memmove(psArrData[i],psArrData[i+1],(n-i-1)*sizeof(psPtr));
+            memmove(&psArr->data[i],&psArr->data[i+1],(n-i-1)*sizeof(psPtr));
             n--;
             success = true;