diff options
author | Bruce Momjian | 2007-11-16 00:13:02 +0000 |
---|---|---|
committer | Bruce Momjian | 2007-11-16 00:13:02 +0000 |
commit | 224f91f66df502dbb6f1d793fd09f4421cbd4043 (patch) | |
tree | 2b5ed56f22621e2ffca6fbf318772e10290988f5 /contrib/pg_trgm | |
parent | 7d4c99b4146f81f638b702ac80846db0b23dfd82 (diff) |
Modify LOOPBYTE/LOOPBIT macros to be more logical; rather than have the
for() body passed as a parameter, make the macros act as simple headers
to code blocks.
This allows pgindent to be run on these files.
Diffstat (limited to 'contrib/pg_trgm')
-rw-r--r-- | contrib/pg_trgm/trgm.h | 6 | ||||
-rw-r--r-- | contrib/pg_trgm/trgm_gist.c | 49 |
2 files changed, 26 insertions, 29 deletions
diff --git a/contrib/pg_trgm/trgm.h b/contrib/pg_trgm/trgm.h index cc07d4b0ef9..5a8d2e362a7 100644 --- a/contrib/pg_trgm/trgm.h +++ b/contrib/pg_trgm/trgm.h @@ -49,10 +49,8 @@ typedef struct typedef char BITVEC[SIGLEN]; typedef char *BITVECP; -#define LOOPBYTE(a) \ - for(i=0;i<SIGLEN;i++) {\ - a;\ - } +#define LOOPBYTE \ + for(i=0;i<SIGLEN;i++) #define GETBYTE(x,i) ( *( (BITVECP)(x) + (int)( (i) / BITBYTE ) ) ) #define GETBITBYTE(x,i) ( ((char)(x)) >> i & 0x01 ) diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c index 260fe01da42..efee71eaf12 100644 --- a/contrib/pg_trgm/trgm_gist.c +++ b/contrib/pg_trgm/trgm_gist.c @@ -113,10 +113,11 @@ gtrgm_compress(PG_FUNCTION_ARGS) TRGM *res; BITVECP sign = GETSIGN(DatumGetPointer(entry->key)); - LOOPBYTE( - if ((sign[i] & 0xff) != 0xff) + LOOPBYTE + { + if ((sign[i] & 0xff) != 0xff) PG_RETURN_POINTER(retval); - ); + } len = CALCGTSIZE(SIGNKEY | ALLISTRUE, 0); res = (TRGM *) palloc(len); @@ -210,9 +211,8 @@ unionkey(BITVECP sbase, TRGM * add) if (ISALLTRUE(add)) return 1; - LOOPBYTE( - sbase[i] |= sadd[i]; - ); + LOOPBYTE + sbase[i] |= sadd[i]; } else { @@ -284,13 +284,14 @@ gtrgm_same(PG_FUNCTION_ARGS) sb = GETSIGN(b); *result = true; - LOOPBYTE( - if (sa[i] != sb[i]) - { - *result = false; - break; + LOOPBYTE + { + if (sa[i] != sb[i]) + { + *result = false; + break; + } } - ); } } else @@ -325,9 +326,8 @@ sizebitvec(BITVECP sign) int4 size = 0, i; - LOOPBYTE( - size += number_of_ones[(unsigned char) sign[i]]; - ); + LOOPBYTE + size += number_of_ones[(unsigned char) sign[i]]; return size; } @@ -338,10 +338,11 @@ hemdistsign(BITVECP a, BITVECP b) diff, dist = 0; - LOOPBYTE( - diff = (unsigned char) (a[i] ^ b[i]); - dist += number_of_ones[diff]; - ); + LOOPBYTE + { + diff = (unsigned char) (a[i] ^ b[i]); + dist += number_of_ones[diff]; + } return dist; } @@ -594,9 +595,8 @@ gtrgm_picksplit(PG_FUNCTION_ARGS) else { ptr = cache[j].sign; - LOOPBYTE( - union_l[i] |= ptr[i]; - ); + LOOPBYTE + union_l[i] |= ptr[i]; } *left++ = j; v->spl_nleft++; @@ -611,9 +611,8 @@ gtrgm_picksplit(PG_FUNCTION_ARGS) else { ptr = cache[j].sign; - LOOPBYTE( - union_r[i] |= ptr[i]; - ); + LOOPBYTE + union_r[i] |= ptr[i]; } *right++ = j; v->spl_nright++; |