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

Timestamp:

Jun 21, 2005, 4:05:41 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

File:

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

trunk/psLib/src/collections/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 00:53:32 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-22 02:05:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -49 +49 @@
   FUNCTION IMPLEMENTATION - PUBLIC
  *****************************************************************************/
-psArray* psArrayAlloc(psU32 nalloc)
+psArray* psArrayAlloc(unsigned long nalloc)
 {
     psArray* psArr = NULL;
@@ -66 +66 @@
 }
 
-psArray* psArrayRealloc(psArray* in, psU32 nalloc)
+psArray* psArrayRealloc(psArray* in, unsigned long nalloc)
 {
     if (in == NULL) {
@@ -159 +159 @@
 
 /// Set an element in the array.
-psBool psArraySet(psArray* in,                       ///< input array to set element in
-                  psU32 position,                    ///< the element position to set
-                  void* value)                       ///< the value to set it to
-{
-    if (in == NULL)
+bool psArraySet(psArray* array,                      ///< input array to set element in
+                unsigned long position,            ///< the element position to set
+                psPtr data)                        ///< the value to set it to
+{
+    if (array == NULL)
     {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
@@ -170 +170 @@
     }
 
-    if (position >= in->nalloc)
+    if (position >= array->nalloc)
     {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psArray_POSITION_BEYOND_NALLOC,
-                position, in->nalloc);
+                position, array->nalloc);
         return false;
     }
 
-    psFree(in->data[position]);
-    in->data[position] = value;
+    psFree(array->data[position]);
+    array->data[position] = data;
 
     return true;
@@ -185 +185 @@
 
 /// Get an element in the array.
-void* psArrayGet(psArray* in, psU32 position )
-{
-    if (in == NULL) {
+psPtr psArrayGet(const psArray* array, unsigned long position )
+{
+    if (array == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psArray_ARRAY_NULL);
@@ -193 +193 @@
     }
 
-    if (position >= in->nalloc) {
+    if (position >= array->nalloc) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psArray_POSITION_BEYOND_NALLOC,
-                position, in->nalloc);
-        return NULL;
-    }
-
-    return in->data[position];
-}
-
-
-
-
+                position, array->nalloc);
+        return NULL;
+    }
+
+    return array->data[position];
+}
+
+
+
+