Standardize on just one spelling of BITSPERBYTE.

diff --git a/src/backend/lib/bit.c b/src/backend/lib/bit.c
index c13755b08e4d61f6da6dac5d32db2c6db47285d2..b69338ae681a9791a3d91077d4d69728cc2dbf3f 100644 (file)
--- a/src/backend/lib/bit.c
+++ b/src/backend/lib/bit.c
@@ -13,35 +13,29 @@
  *-------------------------------------------------------------------------
  */
 
-/*
- * utils/memutils.h contains declarations of the functions in this file
- */
 #include "postgres.h"
 
 #include "utils/bit.h"
 
+
 void
 BitArraySetBit(BitArray bitArray, BitIndex bitIndex)
 {
-       bitArray[bitIndex / BitsPerByte]
-       |= (1 << (BitsPerByte - (bitIndex % BitsPerByte) - 1));
-       return;
+       bitArray[bitIndex / BITSPERBYTE] |=
+               (1 << (BITSPERBYTE - 1 - (bitIndex % BITSPERBYTE)));
 }
 
 void
 BitArrayClearBit(BitArray bitArray, BitIndex bitIndex)
 {
-       bitArray[bitIndex / BitsPerByte]
-       &= ~(1 << (BitsPerByte - (bitIndex % BitsPerByte) - 1));
-       return;
+       bitArray[bitIndex / BITSPERBYTE] &=
+               ~(1 << (BITSPERBYTE - 1 - (bitIndex % BITSPERBYTE)));
 }
 
 bool
 BitArrayBitIsSet(BitArray bitArray, BitIndex bitIndex)
 {
-       return ((bool) (((bitArray[bitIndex / BitsPerByte] &
-                                         (1 << (BitsPerByte - (bitIndex % BitsPerByte)
-                                                        - 1)
-                                          )
-                                         ) != 0) ? 1 : 0));
+       return ((bitArray[bitIndex / BITSPERBYTE] &
+                        (1 << (BITSPERBYTE - 1 - (bitIndex % BITSPERBYTE)))
+               ) != 0);
 }

diff --git a/src/include/utils/bit.h b/src/include/utils/bit.h
index f0144ba1cd4772a0a9978b86de66de1de3eb6dec..8904314d262f09cd91694dfd1a71db35b47c29e1 100644 (file)
--- a/src/include/utils/bit.h
+++ b/src/include/utils/bit.h
@@ -17,8 +17,6 @@
 typedef bits8 *BitArray;
 typedef uint32 BitIndex;
 
-#define BitsPerByte            8
-
 /*
  * BitArraySetBit
  *             Sets (to 1) the value of a bit in a bit array.