Changeset 614 for trunk/psLib/src/collections/psBitSet.c

Timestamp:

May 7, 2004, 2:08:27 PM (22 years ago)

Author:

harman

Message:

Added splint changes

File:

• trunk/psLib/src/collections/psBitSet.c (modified) (8 diffs)

trunk/psLib/src/collections/psBitSet.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-05 20:43:22 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-08 00:08:27 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -55 +55 @@
 /*****************************************************************************/
 
-/** Private function to return a byte.
- *
- *  Finds the byte containing the bit within the byte array.
- *
- *  @return  char*: Pointer to byte in which bit is contained.
- */
-static char* getByte(int bit, const psBitSet *restrict inMask)
-{
-    int index = 0;
-    char *byte = 0;
-    index = bit/8;
-    byte = inMask->bits+index;
-
-    return byte;
-}
-
 /** Private function to create a mask.
  *
@@ -80 +64 @@
 static char mask(int bit)
 {
-    char mask = 0x01;
+    char mask = (char)0x01;
+    // Ignore splint warning about negative bit shifts
+    /*@i@*/
     mask = mask << (bit%8);
 
@@ -91 +77 @@
 psBitSet* psBitSetAlloc(int n)
 {
-    psBitSet *newObj = psAlloc(sizeof(psBitSet));
+    psBitSet *newObj = NULL;
+
+    if(n <= 0) {
+        psError(__func__, " : Line %d - Allocation size must be >= 0: size = %d\n", __LINE__, n);
+        return 0;
+    }
+
+    newObj = psAlloc(sizeof(psBitSet));
     newObj->n = n;
+
+    // Ignore splint warning about releasing pointer members, since they've not been allocated yet
+    /*@i@*/
     newObj->bits = psAlloc(sizeof(char)*n);
     memset(newObj->bits, n, 0);
@@ -101 +97 @@
 void psBitSetFree(psBitSet *restrict inBitSet)
 {
+    if(inBitSet == NULL) {
+        psError(__func__, " : Line %d - Null psBitSet for inBitSet argument\n", __LINE__);
+        return;
+    }
     psFree(inBitSet->bits);
     psFree(inBitSet);
@@ -107 +107 @@
 psBitSet* psBitSetSet(psBitSet *inBitSet, int bit)
 {
-    char* byte = getByte(bit, inBitSet);
+    char* byte = NULL;
+
+    if(inBitSet == NULL) {
+        psError(__func__, " : Line %d - Null psBitSet for inBitSet argument\n", __LINE__);
+        return inBitSet;
+    } else if(bit < 0) {
+        psError(__func__, " : Line %d - Negative bit position not allowed: %d\n", __LINE__, bit);
+        return inBitSet;
+    }
+
+    // Variable byte is the byte in the array that contains the bit to be set
+    byte = inBitSet->bits+bit/8;
     *byte |= mask(bit);
 
@@ -115 +126 @@
 int psBitSetTest(const psBitSet *inBitSet, int bit)
 {
-    char* byte = getByte(bit, inBitSet);
-    if((*byte&mask(bit)) == 0) {
+    char* byte = NULL;
+
+    if(inBitSet == NULL) {
+        psError(__func__, " : Line %d - Null psBitSet for inBitSet argument\n", __LINE__);
+        return 0;
+    } else if(bit < 0) {
+        psError(__func__, " : Line %d - Negative bit position not allowed: %d\n", __LINE__, bit);
+        return 0;
+    }
+
+    // Variable byte is the byte in the array that contains the bit to be tested
+    byte = inBitSet->bits+bit/8;
+    if((int)(*byte&mask(bit)) == 0) {
         return 0;
     }
@@ -191 +213 @@
     int i = 0;
     int numBits = inBitSet->n*8;
-    char* outString = psAlloc(numBits);
+    char* outString = psAlloc((size_t)numBits);
     for(i=0; i<numBits; i++) {
-        outString[numBits-i-1] = (psBitSetTest(inBitSet, i))?'1':'0';
+        outString[numBits-i-1] = (psBitSetTest(inBitSet, i) == 1)?'1':'0';
     }