diff options
| author | Tom Lane | 2000-08-20 19:31:37 +0000 |
|---|---|---|
| committer | Tom Lane | 2000-08-20 19:31:37 +0000 |
| commit | b2b3079a85b79b2840c26cfc6ba352beb2231c71 (patch) | |
| tree | 94884be3a3d7407d6df9f9525ad7e10bbb0f673e | |
| parent | b816790cbe9ca5bc724737c10a37219254d3bf93 (diff) | |
Standardize on just one spelling of BITSPERBYTE.
| -rw-r--r-- | src/backend/lib/bit.c | 22 | ||||
| -rw-r--r-- | src/include/utils/bit.h | 2 |
2 files changed, 8 insertions, 16 deletions
diff --git a/src/backend/lib/bit.c b/src/backend/lib/bit.c index c13755b08e..b69338ae68 100644 --- 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 f0144ba1cd..8904314d26 100644 --- 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. |