Index: /trunk/psLib/src/collections/psArray.c
===================================================================
--- /trunk/psLib/src/collections/psArray.c	(revision 4311)
+++ /trunk/psLib/src/collections/psArray.c	(revision 4312)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 23:39:51 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -86,25 +86,25 @@
 }
 
-psArray* psArrayAdd(psArray* psArr,
-                    int delta,
+psArray* psArrayAdd(psArray* array,
+                    long delta,
                     psPtr data)
 {
-    if (psArr == NULL) {
-        return psArr;
-    }
-
-    int n = psArr->n;
-
-    if (n >= psArr->nalloc) {
+    if (array == NULL) {
+        return array;
+    }
+
+    int n = array->n;
+
+    if (n >= array->nalloc) {
         // array needs to be expanded to make room for more elements
         int d = (delta > 0) ? delta : 10; // as spec'ed in SDRS.
-        psArr = psArrayRealloc(psArr, n+d);
+        array = psArrayRealloc(array, n+d);
     }
 
     // add the element to the end of the array.
-    psArr->data[n] = psMemIncrRefCounter(data);
-    psArr->n = n+1;
-
-    return psArr;
+    array->data[n] = psMemIncrRefCounter(data);
+    array->n = n+1;
+
+    return array;
 }
 
@@ -147,13 +147,13 @@
 }
 
-psArray* psArraySort(psArray* in, psComparePtrFcn compare)
-{
-    if (in == NULL) {
-        return NULL;
-    }
-
-    qsort(in->data, in->n, sizeof(psPtr), (int (*)(const void* , const void*))compare);
-
-    return in;
+psArray* psArraySort(psArray* array, psComparePtrFcn func)
+{
+    if (array == NULL) {
+        return NULL;
+    }
+
+    qsort(array->data, array->n, sizeof(psPtr), (int (*)(const void* , const void*))func);
+
+    return array;
 }
 
Index: /trunk/psLib/src/collections/psArray.h
===================================================================
--- /trunk/psLib/src/collections/psArray.h	(revision 4311)
+++ /trunk/psLib/src/collections/psArray.h	(revision 4312)
@@ -12,6 +12,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 23:39:51 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -77,6 +77,6 @@
  */
 psArray* psArrayAdd(
-    psArray* psArr,                    ///< array to operate on
-    int delta,
+    psArray* array,                    ///< array to operate on
+    long delta,
     ///< the amount to expand array, if necessary.  If less than one, 10 will be used.
     psPtr data                         ///< the data pointer to add to psArray
@@ -122,6 +122,6 @@
  */
 psArray* psArraySort(
-    psArray* in,                       ///< input array to sort.
-    psComparePtrFcn compare            ///< the compare function
+    psArray* array,                       ///< input array to sort.
+    psComparePtrFcn func                  ///< the compare function
 );
 
Index: /trunk/psLib/src/collections/psBitSet.c
===================================================================
--- /trunk/psLib/src/collections/psBitSet.c	(revision 4311)
+++ /trunk/psLib/src/collections/psBitSet.c	(revision 4312)
@@ -11,6 +11,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -66,17 +66,17 @@
 }
 
-psBitSet* psBitSetAlloc(psS32 n)
+psBitSet* psBitSetAlloc(long nalloc)
 {
     psS32 numBytes = 0;
     psBitSet* newObj = NULL;
 
-    if (n < 0) {
+    if (nalloc < 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 PS_ERRORTEXT_psBitSet_ALLOC_NEG_SIZE,
-                n);
-        return NULL;
-    }
-
-    numBytes = ceil(n / 8.0);
+                nalloc);
+        return NULL;
+    }
+
+    numBytes = ceil(nalloc / 8.0);
     newObj = psAlloc(sizeof(psBitSet));
     psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree);
@@ -92,69 +92,69 @@
 }
 
-psBitSet* psBitSetSet(psBitSet* inBitSet,
-                      psS32 bit)
+psBitSet* psBitSetSet(psBitSet* bitSet,
+                      long bit)
 {
     char *byte = NULL;
 
-    if (inBitSet == NULL) {
+    if (bitSet == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psBitSet_SET_NULL);
-        return inBitSet;
+        return bitSet;
     } else if ( (bit < 0) ||
-                (bit > inBitSet->n * 8 - 1) ) {
+                (bit > bitSet->n * 8 - 1) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE,
-                bit,inBitSet->n * 8 - 1);
-        return inBitSet;
+                bit,bitSet->n * 8 - 1);
+        return bitSet;
     }
     // Variable byte is the byte in the array that contains the bit to be set
-    byte = inBitSet->bits + bit / 8;
+    byte = bitSet->bits + bit / 8;
     *byte |= mask(bit);
 
-    return inBitSet;
-}
-
-psBitSet* psBitSetClear(psBitSet* inBitSet,
-                        psS32 bit)
+    return bitSet;
+}
+
+psBitSet* psBitSetClear(psBitSet* bitSet,
+                        long bit)
 {
     char *byte = NULL;
 
-    if (inBitSet == NULL) {
+    if (bitSet == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psBitSet_SET_NULL);
-        return inBitSet;
+        return bitSet;
     } else if ( (bit < 0) ||
-                (bit > inBitSet->n * 8 - 1) ) {
+                (bit > bitSet->n * 8 - 1) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE,
-                bit,inBitSet->n * 8 - 1);
-        return inBitSet;
+                bit,bitSet->n * 8 - 1);
+        return bitSet;
     }
     // Variable byte is the byte in the array that contains the bit to be set
-    byte = inBitSet->bits + bit / 8;
+    byte = bitSet->bits + bit / 8;
     *byte &= ! mask(bit);
 
-    return inBitSet;
-}
-
-psBool psBitSetTest(const psBitSet* inBitSet,
-                    psS32 bit)
+    return bitSet;
+}
+
+bool psBitSetTest(const psBitSet* bitSet,
+                  long bit)
 {
     char *byte = NULL;
 
-    if (inBitSet == NULL) {
+    if (bitSet == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psBitSet_SET_NULL);
         return false;
     } else if ( (bit < 0) ||
-                (bit > inBitSet->n * 8 - 1) ) {
+                (bit > bitSet->n * 8 - 1) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE,
-                bit,inBitSet->n * 8 - 1);
+                bit,bitSet->n * 8 - 1);
         return false;
     }
 
     // Variable byte is the byte in the array that contains the bit to be tested
-    byte = inBitSet->bits + bit / 8;
+    byte = bitSet->bits + bit / 8;
     return ((*byte & mask(bit)) != 0);
 }
@@ -162,5 +162,5 @@
 psBitSet* psBitSetOp(psBitSet* outBitSet,
                      const psBitSet* inBitSet1,
-                     char *operator,
+                     const char *operator,
                      const psBitSet* inBitSet2)
 {
Index: /trunk/psLib/src/collections/psBitSet.h
===================================================================
--- /trunk/psLib/src/collections/psBitSet.h	(revision 4311)
+++ /trunk/psLib/src/collections/psBitSet.h	(revision 4312)
@@ -12,6 +12,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -56,5 +56,5 @@
 /*@null@*/
 psBitSet* psBitSetAlloc(
-    psS32 n                            ///< Number of bits in psBitSet array
+    long nalloc                            ///< Number of bits in psBitSet array
 );
 
@@ -69,6 +69,6 @@
 psBitSet* psBitSetSet(
     /* @returned@ */
-    psBitSet* inMask,                  ///< Pointer to psBitSet to be set.
-    psS32 bit                          ///< Bit to be set.
+    psBitSet* bitSet,                  ///< Pointer to psBitSet to be set.
+    long bit                          ///< Bit to be set.
 );
 
@@ -83,6 +83,6 @@
 psBitSet* psBitSetClear(
     /* @returned@ */
-    psBitSet* inMask,                  ///< Pointer to psBitSet to be cleared.
-    psS32 bit                          ///< Bit to be cleared.
+    psBitSet* bitSet,                  ///< Pointer to psBitSet to be cleared.
+    long bit                           ///< Bit to be cleared.
 );
 
@@ -97,7 +97,7 @@
  */
 
-psBool psBitSetTest(
-    const psBitSet* inMask,            ///< Pointer psBitSet to be tested.
-    psS32 bit                          ///< Bit to be tested.
+bool psBitSetTest(
+    const psBitSet* bitSet,            ///< Pointer psBitSet to be tested.
+    long bit                           ///< Bit to be tested.
 );
 
@@ -111,8 +111,8 @@
 psBitSet* psBitSetOp(
     /* @returned@ */
-    psBitSet* outMask,                 ///< Resulting psBitSet from binary operation
-    const psBitSet* inMask1,           ///< First psBitSet on which to operate
-    char *operator,                    ///< Bit operation
-    const psBitSet* inMask2            ///< First psBitSet on which to operate
+    psBitSet* outBitSet,                 ///< Resulting psBitSet from binary operation
+    const psBitSet* inBitSet1,           ///< First psBitSet on which to operate
+    const char *operator,                    ///< Bit operation
+    const psBitSet* inBitSet2            ///< First psBitSet on which to operate
 );
 
Index: /trunk/psLib/src/collections/psList.c
===================================================================
--- /trunk/psLib/src/collections/psList.c	(revision 4311)
+++ /trunk/psLib/src/collections/psList.c	(revision 4312)
@@ -6,6 +6,6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -592,17 +592,17 @@
 }
 
-psList* psArrayToList(psArray* arr)
+psList* psArrayToList(const psArray* array)
 {
     psU32 n;
     psList* list;               // list of elements
 
-    if (arr == NULL) {
+    if (array == NULL) {
         return NULL;
     }
 
     list = psListAlloc(NULL);
-    n = arr->n;
+    n = array->n;
     for (psS32 i = 0; i < n; i++) {
-        psListAdd(list, PS_LIST_TAIL, arr->data[i]);
+        psListAdd(list, PS_LIST_TAIL, array->data[i]);
     }
 
Index: /trunk/psLib/src/collections/psList.h
===================================================================
--- /trunk/psLib/src/collections/psList.h	(revision 4311)
+++ /trunk/psLib/src/collections/psList.h	(revision 4312)
@@ -7,6 +7,6 @@
  *  @ingroup LinkedList
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -205,5 +205,5 @@
  */
 psList* psArrayToList(
-    psArray* arr                       ///< vector to convert
+    const psArray* array                       ///< vector to convert
 );
 
Index: /trunk/psLib/src/dataIO/psDB.c
===================================================================
--- /trunk/psLib/src/dataIO/psDB.c	(revision 4311)
+++ /trunk/psLib/src/dataIO/psDB.c	(revision 4312)
@@ -12,6 +12,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 00:52:56 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -244,5 +244,5 @@
 }
 
-psArray *psDBSelectColumn(psDB *dbh, const char *tableName, const char *col, psU64 limit)
+psArray *psDBSelectColumn(psDB *dbh, const char *tableName, const char *col, unsigned long long limit)
 {
     MYSQL_RES       *result;            // complete db result set
@@ -339,5 +339,5 @@
 }
 
-psVector *psDBSelectColumnNum(psDB *dbh, const char *tableName, const char *col, psElemType pType, const psU64 limit)
+psVector *psDBSelectColumnNum(psDB *dbh, const char *tableName, const char *col, psElemType type, unsigned long long limit)
 {
     psArray         *stringColumn;      // source psArray
@@ -350,8 +350,8 @@
     }
 
-    column = psVectorAlloc(stringColumn->n, pType);
+    column = psVectorAlloc(stringColumn->n, type);
 
     // conversion functions are a portability issue
-    switch (pType) {
+    switch (type) {
     case PS_TYPE_S8:
         PS_STR_ARRAY_TO_PTYPE(column->data.S8, stringColumn, atoi, psS8, PS_TYPE_S8);
@@ -403,5 +403,5 @@
 }
 
-psArray *psDBSelectRows(psDB *dbh, const char *tableName, psMetadata *where, const psU64 limit)
+psArray *psDBSelectRows(psDB *dbh, const char *tableName, psMetadata *where, unsigned long long limit)
 {
     MYSQL_RES       *result;            // complete db result set
@@ -536,5 +536,5 @@
 }
 
-bool psDBInsertRows(psDB *dbh, const char *tableName, psArray *rowSet)
+bool psDBInsertRows(psDB *dbh, const char *tableName, const psArray *rowSet)
 {
     psMetadata      *row;               // row of data
Index: /trunk/psLib/src/dataIO/psDB.h
===================================================================
--- /trunk/psLib/src/dataIO/psDB.h	(revision 4311)
+++ /trunk/psLib/src/dataIO/psDB.h	(revision 4312)
@@ -10,6 +10,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-07 02:29:44 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -143,5 +143,5 @@
     const char *tableName,              ///< Table name
     const char *col,                    ///< Column name
-    const psU64 limit                   ///< Maximum number of elements to return
+    unsigned long long limit                   ///< Maximum number of elements to return
 );
 
@@ -158,6 +158,6 @@
     const char *tableName,              ///< Table name
     const char *col,                    ///< Column name
-    psElemType pType,                   ///< Resulting psVector type
-    const psU64 limit                   ///< Maximum number of elements to return
+    psElemType type,                   ///< Resulting psVector type
+    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -179,6 +179,6 @@
     psDB *dbh,                          ///< Database handle
     const char *tableName,              ///< Table name
-    psMetadata *where,                  ///< Row match criteria
-    const psU64 limit                   ///< Maximum number of elements to return
+    psMetadata *where,            ///< Row match criteria
+    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -212,5 +212,5 @@
     psDB *dbh,                          ///< Database handle
     const char *tableName,              ///< Table name
-    psArray *rowSet                     ///< Set of rows to insert
+    const psArray *rowSet                     ///< Set of rows to insert
 );
 
Index: /trunk/psLib/src/db/psDB.c
===================================================================
--- /trunk/psLib/src/db/psDB.c	(revision 4311)
+++ /trunk/psLib/src/db/psDB.c	(revision 4312)
@@ -12,6 +12,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 00:52:56 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -244,5 +244,5 @@
 }
 
-psArray *psDBSelectColumn(psDB *dbh, const char *tableName, const char *col, psU64 limit)
+psArray *psDBSelectColumn(psDB *dbh, const char *tableName, const char *col, unsigned long long limit)
 {
     MYSQL_RES       *result;            // complete db result set
@@ -339,5 +339,5 @@
 }
 
-psVector *psDBSelectColumnNum(psDB *dbh, const char *tableName, const char *col, psElemType pType, const psU64 limit)
+psVector *psDBSelectColumnNum(psDB *dbh, const char *tableName, const char *col, psElemType type, unsigned long long limit)
 {
     psArray         *stringColumn;      // source psArray
@@ -350,8 +350,8 @@
     }
 
-    column = psVectorAlloc(stringColumn->n, pType);
+    column = psVectorAlloc(stringColumn->n, type);
 
     // conversion functions are a portability issue
-    switch (pType) {
+    switch (type) {
     case PS_TYPE_S8:
         PS_STR_ARRAY_TO_PTYPE(column->data.S8, stringColumn, atoi, psS8, PS_TYPE_S8);
@@ -403,5 +403,5 @@
 }
 
-psArray *psDBSelectRows(psDB *dbh, const char *tableName, psMetadata *where, const psU64 limit)
+psArray *psDBSelectRows(psDB *dbh, const char *tableName, psMetadata *where, unsigned long long limit)
 {
     MYSQL_RES       *result;            // complete db result set
@@ -536,5 +536,5 @@
 }
 
-bool psDBInsertRows(psDB *dbh, const char *tableName, psArray *rowSet)
+bool psDBInsertRows(psDB *dbh, const char *tableName, const psArray *rowSet)
 {
     psMetadata      *row;               // row of data
Index: /trunk/psLib/src/db/psDB.h
===================================================================
--- /trunk/psLib/src/db/psDB.h	(revision 4311)
+++ /trunk/psLib/src/db/psDB.h	(revision 4312)
@@ -10,6 +10,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-07 02:29:44 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -143,5 +143,5 @@
     const char *tableName,              ///< Table name
     const char *col,                    ///< Column name
-    const psU64 limit                   ///< Maximum number of elements to return
+    unsigned long long limit                   ///< Maximum number of elements to return
 );
 
@@ -158,6 +158,6 @@
     const char *tableName,              ///< Table name
     const char *col,                    ///< Column name
-    psElemType pType,                   ///< Resulting psVector type
-    const psU64 limit                   ///< Maximum number of elements to return
+    psElemType type,                   ///< Resulting psVector type
+    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -179,6 +179,6 @@
     psDB *dbh,                          ///< Database handle
     const char *tableName,              ///< Table name
-    psMetadata *where,                  ///< Row match criteria
-    const psU64 limit                   ///< Maximum number of elements to return
+    psMetadata *where,            ///< Row match criteria
+    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -212,5 +212,5 @@
     psDB *dbh,                          ///< Database handle
     const char *tableName,              ///< Table name
-    psArray *rowSet                     ///< Set of rows to insert
+    const psArray *rowSet                     ///< Set of rows to insert
 );
 
Index: /trunk/psLib/src/types/psArray.c
===================================================================
--- /trunk/psLib/src/types/psArray.c	(revision 4311)
+++ /trunk/psLib/src/types/psArray.c	(revision 4312)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 23:39:51 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -86,25 +86,25 @@
 }
 
-psArray* psArrayAdd(psArray* psArr,
-                    int delta,
+psArray* psArrayAdd(psArray* array,
+                    long delta,
                     psPtr data)
 {
-    if (psArr == NULL) {
-        return psArr;
-    }
-
-    int n = psArr->n;
-
-    if (n >= psArr->nalloc) {
+    if (array == NULL) {
+        return array;
+    }
+
+    int n = array->n;
+
+    if (n >= array->nalloc) {
         // array needs to be expanded to make room for more elements
         int d = (delta > 0) ? delta : 10; // as spec'ed in SDRS.
-        psArr = psArrayRealloc(psArr, n+d);
+        array = psArrayRealloc(array, n+d);
     }
 
     // add the element to the end of the array.
-    psArr->data[n] = psMemIncrRefCounter(data);
-    psArr->n = n+1;
-
-    return psArr;
+    array->data[n] = psMemIncrRefCounter(data);
+    array->n = n+1;
+
+    return array;
 }
 
@@ -147,13 +147,13 @@
 }
 
-psArray* psArraySort(psArray* in, psComparePtrFcn compare)
-{
-    if (in == NULL) {
-        return NULL;
-    }
-
-    qsort(in->data, in->n, sizeof(psPtr), (int (*)(const void* , const void*))compare);
-
-    return in;
+psArray* psArraySort(psArray* array, psComparePtrFcn func)
+{
+    if (array == NULL) {
+        return NULL;
+    }
+
+    qsort(array->data, array->n, sizeof(psPtr), (int (*)(const void* , const void*))func);
+
+    return array;
 }
 
Index: /trunk/psLib/src/types/psArray.h
===================================================================
--- /trunk/psLib/src/types/psArray.h	(revision 4311)
+++ /trunk/psLib/src/types/psArray.h	(revision 4312)
@@ -12,6 +12,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 23:39:51 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -77,6 +77,6 @@
  */
 psArray* psArrayAdd(
-    psArray* psArr,                    ///< array to operate on
-    int delta,
+    psArray* array,                    ///< array to operate on
+    long delta,
     ///< the amount to expand array, if necessary.  If less than one, 10 will be used.
     psPtr data                         ///< the data pointer to add to psArray
@@ -122,6 +122,6 @@
  */
 psArray* psArraySort(
-    psArray* in,                       ///< input array to sort.
-    psComparePtrFcn compare            ///< the compare function
+    psArray* array,                       ///< input array to sort.
+    psComparePtrFcn func                  ///< the compare function
 );
 
Index: /trunk/psLib/src/types/psBitSet.c
===================================================================
--- /trunk/psLib/src/types/psBitSet.c	(revision 4311)
+++ /trunk/psLib/src/types/psBitSet.c	(revision 4312)
@@ -11,6 +11,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -66,17 +66,17 @@
 }
 
-psBitSet* psBitSetAlloc(psS32 n)
+psBitSet* psBitSetAlloc(long nalloc)
 {
     psS32 numBytes = 0;
     psBitSet* newObj = NULL;
 
-    if (n < 0) {
+    if (nalloc < 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 PS_ERRORTEXT_psBitSet_ALLOC_NEG_SIZE,
-                n);
-        return NULL;
-    }
-
-    numBytes = ceil(n / 8.0);
+                nalloc);
+        return NULL;
+    }
+
+    numBytes = ceil(nalloc / 8.0);
     newObj = psAlloc(sizeof(psBitSet));
     psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree);
@@ -92,69 +92,69 @@
 }
 
-psBitSet* psBitSetSet(psBitSet* inBitSet,
-                      psS32 bit)
+psBitSet* psBitSetSet(psBitSet* bitSet,
+                      long bit)
 {
     char *byte = NULL;
 
-    if (inBitSet == NULL) {
+    if (bitSet == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psBitSet_SET_NULL);
-        return inBitSet;
+        return bitSet;
     } else if ( (bit < 0) ||
-                (bit > inBitSet->n * 8 - 1) ) {
+                (bit > bitSet->n * 8 - 1) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE,
-                bit,inBitSet->n * 8 - 1);
-        return inBitSet;
+                bit,bitSet->n * 8 - 1);
+        return bitSet;
     }
     // Variable byte is the byte in the array that contains the bit to be set
-    byte = inBitSet->bits + bit / 8;
+    byte = bitSet->bits + bit / 8;
     *byte |= mask(bit);
 
-    return inBitSet;
-}
-
-psBitSet* psBitSetClear(psBitSet* inBitSet,
-                        psS32 bit)
+    return bitSet;
+}
+
+psBitSet* psBitSetClear(psBitSet* bitSet,
+                        long bit)
 {
     char *byte = NULL;
 
-    if (inBitSet == NULL) {
+    if (bitSet == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psBitSet_SET_NULL);
-        return inBitSet;
+        return bitSet;
     } else if ( (bit < 0) ||
-                (bit > inBitSet->n * 8 - 1) ) {
+                (bit > bitSet->n * 8 - 1) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE,
-                bit,inBitSet->n * 8 - 1);
-        return inBitSet;
+                bit,bitSet->n * 8 - 1);
+        return bitSet;
     }
     // Variable byte is the byte in the array that contains the bit to be set
-    byte = inBitSet->bits + bit / 8;
+    byte = bitSet->bits + bit / 8;
     *byte &= ! mask(bit);
 
-    return inBitSet;
-}
-
-psBool psBitSetTest(const psBitSet* inBitSet,
-                    psS32 bit)
+    return bitSet;
+}
+
+bool psBitSetTest(const psBitSet* bitSet,
+                  long bit)
 {
     char *byte = NULL;
 
-    if (inBitSet == NULL) {
+    if (bitSet == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psBitSet_SET_NULL);
         return false;
     } else if ( (bit < 0) ||
-                (bit > inBitSet->n * 8 - 1) ) {
+                (bit > bitSet->n * 8 - 1) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE,
-                bit,inBitSet->n * 8 - 1);
+                bit,bitSet->n * 8 - 1);
         return false;
     }
 
     // Variable byte is the byte in the array that contains the bit to be tested
-    byte = inBitSet->bits + bit / 8;
+    byte = bitSet->bits + bit / 8;
     return ((*byte & mask(bit)) != 0);
 }
@@ -162,5 +162,5 @@
 psBitSet* psBitSetOp(psBitSet* outBitSet,
                      const psBitSet* inBitSet1,
-                     char *operator,
+                     const char *operator,
                      const psBitSet* inBitSet2)
 {
Index: /trunk/psLib/src/types/psBitSet.h
===================================================================
--- /trunk/psLib/src/types/psBitSet.h	(revision 4311)
+++ /trunk/psLib/src/types/psBitSet.h	(revision 4312)
@@ -12,6 +12,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -56,5 +56,5 @@
 /*@null@*/
 psBitSet* psBitSetAlloc(
-    psS32 n                            ///< Number of bits in psBitSet array
+    long nalloc                            ///< Number of bits in psBitSet array
 );
 
@@ -69,6 +69,6 @@
 psBitSet* psBitSetSet(
     /* @returned@ */
-    psBitSet* inMask,                  ///< Pointer to psBitSet to be set.
-    psS32 bit                          ///< Bit to be set.
+    psBitSet* bitSet,                  ///< Pointer to psBitSet to be set.
+    long bit                          ///< Bit to be set.
 );
 
@@ -83,6 +83,6 @@
 psBitSet* psBitSetClear(
     /* @returned@ */
-    psBitSet* inMask,                  ///< Pointer to psBitSet to be cleared.
-    psS32 bit                          ///< Bit to be cleared.
+    psBitSet* bitSet,                  ///< Pointer to psBitSet to be cleared.
+    long bit                           ///< Bit to be cleared.
 );
 
@@ -97,7 +97,7 @@
  */
 
-psBool psBitSetTest(
-    const psBitSet* inMask,            ///< Pointer psBitSet to be tested.
-    psS32 bit                          ///< Bit to be tested.
+bool psBitSetTest(
+    const psBitSet* bitSet,            ///< Pointer psBitSet to be tested.
+    long bit                           ///< Bit to be tested.
 );
 
@@ -111,8 +111,8 @@
 psBitSet* psBitSetOp(
     /* @returned@ */
-    psBitSet* outMask,                 ///< Resulting psBitSet from binary operation
-    const psBitSet* inMask1,           ///< First psBitSet on which to operate
-    char *operator,                    ///< Bit operation
-    const psBitSet* inMask2            ///< First psBitSet on which to operate
+    psBitSet* outBitSet,                 ///< Resulting psBitSet from binary operation
+    const psBitSet* inBitSet1,           ///< First psBitSet on which to operate
+    const char *operator,                    ///< Bit operation
+    const psBitSet* inBitSet2            ///< First psBitSet on which to operate
 );
 
Index: /trunk/psLib/src/types/psList.c
===================================================================
--- /trunk/psLib/src/types/psList.c	(revision 4311)
+++ /trunk/psLib/src/types/psList.c	(revision 4312)
@@ -6,6 +6,6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -592,17 +592,17 @@
 }
 
-psList* psArrayToList(psArray* arr)
+psList* psArrayToList(const psArray* array)
 {
     psU32 n;
     psList* list;               // list of elements
 
-    if (arr == NULL) {
+    if (array == NULL) {
         return NULL;
     }
 
     list = psListAlloc(NULL);
-    n = arr->n;
+    n = array->n;
     for (psS32 i = 0; i < n; i++) {
-        psListAdd(list, PS_LIST_TAIL, arr->data[i]);
+        psListAdd(list, PS_LIST_TAIL, array->data[i]);
     }
 
Index: /trunk/psLib/src/types/psList.h
===================================================================
--- /trunk/psLib/src/types/psList.h	(revision 4311)
+++ /trunk/psLib/src/types/psList.h	(revision 4312)
@@ -7,6 +7,6 @@
  *  @ingroup LinkedList
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -205,5 +205,5 @@
  */
 psList* psArrayToList(
-    psArray* arr                       ///< vector to convert
+    const psArray* array                       ///< vector to convert
 );