database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Modify LOOPBYTE/LOOPBIT macros to be more logical; rather than have the

Browse Source 
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.
This commit is contained in:
Bruce Momjian
2007-11-16 00:13:02 +00:00
parent 7d4c99b414
commit 224f91f66d
9 changed files with 191 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/pg_trgm/trgm.h
View File

@ -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 )

49
contrib/pg_trgm/trgm_gist.c
View File

@ -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++;