Index: trunk/psLib/src/collections/psBitSet.c
===================================================================
--- trunk/psLib/src/collections/psBitSet.c	(revision 3682)
+++ 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)
 {