From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 20 Aug 2000 19:31:37 +0000 (+0000)
Subject: Standardize on just one spelling of BITSPERBYTE.
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=b2b3079a85b79b2840c26cfc6ba352beb2231c71;p=users%2Fbernd%2Fpostgres.git

Standardize on just one spelling of BITSPERBYTE.
---

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.