Changeset 4342 for trunk/psLib/src/types

Timestamp:

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

Author:

drobbin

Message:

* empty log message *

Location:

trunk/psLib/src/types

Files:

• psArray.c (modified) (7 diffs)
• psArray.h (modified) (6 diffs)
• psBitSet.c (modified) (2 diffs)
• psBitSet.h (modified) (2 diffs)

trunk/psLib/src/types/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];
+}
+
+
+
+

trunk/psLib/src/types/psArray.h

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 00:53:32 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-22 02:05:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -34 +34 @@
 typedef struct
 {
-    psU32 nalloc;        ///< Total number of elements available.
-    psU32 n;             ///< Number of elements in use.
-    psPtr* data;                ///< An Array of pointer elements
+    psU32 nalloc;                      ///< Total number of elements available.
+    psU32 n;                           ///< Number of elements in use.
+    psPtr* data;                       ///< An Array of pointer elements
 }
 psArray;
@@ -55 +55 @@
  */
 psArray* psArrayAlloc(
-    psU32 nalloc                       ///< Total number of elements to make available.
+    unsigned long nalloc               ///< Total number of elements to make available.
 );
 
@@ -67 +67 @@
  */
 psArray* psArrayRealloc(
-    psArray* psArr,                    ///< array to reallocate.
-    psU32 nalloc                       ///< Total number of elements to make available.
+    psArray* array,                    ///< array to reallocate.
+    unsigned long nalloc               ///< Total number of elements to make available.
 );
 
@@ -131 +131 @@
  *  @return psBool  TRUE if the element was set successfully, otherwise FALSE
  */
-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
+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
 );
 
@@ -141 +141 @@
  *  @return void*   the element at given position.
  */
-void* psArrayGet(
-    psArray* in,                       ///< input array to get element from
-    psU32 position                     ///< the element position to get
+psPtr psArrayGet(
+    const psArray* array,              ///< input array to get element from
+    unsigned long position             ///< the element position to get
 );
 

trunk/psLib/src/types/psBitSet.c

@@ -11 +11 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 00:53:32 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-22 02:05:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -280 +280 @@
 }
 
-char *psBitSetToString(const psBitSet* inBitSet)
+psString psBitSetToString(const psBitSet* bitSet)
 {
     psS32 i = 0;
-    psS32 numBits = inBitSet->n * 8;
+    psS32 numBits = bitSet->n * 8;
     char *outString = psAlloc((size_t) numBits + 1);
 
     for (i = 0; i < numBits; i++) {
-        outString[numBits - i - 1] = psBitSetTest(inBitSet, i) ? '1' : '0';
+        outString[numBits - i - 1] = psBitSetTest(bitSet, i) ? '1' : '0';
     }
 

trunk/psLib/src/types/psBitSet.h

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 00:53:32 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-22 02:05:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -137 +137 @@
  */
 
-char *psBitSetToString(
-    const psBitSet* inMask             ///< psBitSet to convert */
+psString psBitSetToString(
+    const psBitSet* bitSet             ///< psBitSet to convert */
 );