Changeset 4307 for trunk/psLib/src/types

Timestamp:

Jun 17, 2005, 1:39:51 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

Location:

trunk/psLib/src/types

Files:

• psArray.c (modified) (3 diffs)
• psArray.h (modified) (2 diffs)

trunk/psLib/src/types/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-17 23:39:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -109 +109 @@
 }
 
-psBool psArrayRemove(psArray* psArr,
-                     psPtr data)
-{
-    psBool success = false;
-
-    if (psArr == NULL) {
+bool psArrayRemove(psArray* array,
+                   const psPtr data)
+{
+    bool success = false;
+
+    if (array == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psArray_ARRAY_NULL);
@@ -120 +120 @@
     }
 
-    psS32 n = psArr->n;
-    psPtr* psArrData = psArr->data;
+    psS32 n = array->n;
+    psPtr* psArrData = array->data;
     for (psS32 i = n-1; i >= 0; i--) {
         if (psArrData[i] == data) {
-            memmove(&psArr->data[i],&psArr->data[i+1],(n-i-1)*sizeof(psPtr));
+            memmove(&array->data[i],&array->data[i+1],(n-i-1)*sizeof(psPtr));
             n--;
             success = true;
         }
     }
-    psArr->n = n; // reset the array size to indicate the removed item(s)
+    array->n = n; // reset the array size to indicate the removed item(s)
 
     return success;

trunk/psLib/src/types/psArray.h

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-17 23:39:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -91 +91 @@
  *
  */
-psBool psArrayRemove(
-    psArray* psArr,                    ///< array to operate on
-    psPtr data                         ///< the data pointer to remove from psArray
+bool psArrayRemove(
+    psArray* array,                    ///< array to operate on
+    const psPtr data                   ///< the data pointer to remove from psArray
 );