From 261114a23f51c3d35a50ac27f2f453c6767bfeff Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sun, 25 Dec 2005 02:14:19 +0000 Subject: I have added these macros to c.h: #define HIGHBIT (0x80) #define IS_HIGHBIT_SET(ch) ((unsigned char)(ch) & HIGHBIT) and removed CSIGNBIT and mapped it uses to HIGHBIT. I have also added uses for IS_HIGHBIT_SET where appropriate. This change is purely for code clarity. --- src/backend/utils/adt/varbit.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/backend/utils/adt/varbit.c') diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c index 7dbbed16f6..8fb0e4186a 100644 --- a/src/backend/utils/adt/varbit.c +++ b/src/backend/utils/adt/varbit.c @@ -9,7 +9,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/varbit.c,v 1.47 2005/10/15 02:49:30 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/varbit.c,v 1.48 2005/12/25 02:14:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -120,7 +120,7 @@ bit_in(PG_FUNCTION_ARGS) { /* Parse the bit representation of the string */ /* We know it fits, as bitlen was compared to atttypmod */ - x = BITHIGH; + x = HIGHBIT; for (; *sp; sp++) { if (*sp == '1') @@ -134,7 +134,7 @@ bit_in(PG_FUNCTION_ARGS) x >>= 1; if (x == 0) { - x = BITHIGH; + x = HIGHBIT; r++; } } @@ -401,7 +401,7 @@ varbit_in(PG_FUNCTION_ARGS) { /* Parse the bit representation of the string */ /* We know it fits, as bitlen was compared to atttypmod */ - x = BITHIGH; + x = HIGHBIT; for (; *sp; sp++) { if (*sp == '1') @@ -415,7 +415,7 @@ varbit_in(PG_FUNCTION_ARGS) x >>= 1; if (x == 0) { - x = BITHIGH; + x = HIGHBIT; r++; } } @@ -477,14 +477,14 @@ varbit_out(PG_FUNCTION_ARGS) x = *sp; for (k = 0; k < BITS_PER_BYTE; k++) { - *r++ = (x & BITHIGH) ? '1' : '0'; + *r++ = IS_HIGHBIT_SET(x) ? '1' : '0'; x <<= 1; } } x = *sp; for (k = i; k < len; k++) { - *r++ = (x & BITHIGH) ? '1' : '0'; + *r++ = IS_HIGHBIT_SET(x) ? '1' : '0'; x <<= 1; } *r = '\0'; -- cgit v1.2.1