1
0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00

Simplify/clean up code for varlena types

This commit is contained in:
Teodor Sigaev
2005-03-01 15:40:04 +00:00
parent 03b8efa540
commit e1662cb6b8
6 changed files with 58 additions and 161 deletions

View File

@ -67,7 +67,7 @@ static bytea *
gbt_bit_xfrm(bytea *leaf)
{
bytea *out = leaf;
int s = VARBITBYTES(leaf) + VARHDRSZ;
int s = INTALIGN(VARBITBYTES(leaf) + VARHDRSZ);
out = palloc(s);
VARATT_SIZEP(out) = s;
@ -126,8 +126,7 @@ Datum
gbt_bit_consistent(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
GBT_VARKEY *ktst = (GBT_VARKEY *) DatumGetPointer(entry->key);
GBT_VARKEY *key = (GBT_VARKEY *) DatumGetPointer(PG_DETOAST_DATUM(entry->key));
GBT_VARKEY *key = (GBT_VARKEY *) DatumGetPointer(entry->key);
void *qtst = (void *) DatumGetPointer(PG_GETARG_DATUM(1));
void *query = (void *) DatumGetByteaP(PG_GETARG_DATUM(1));
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
@ -144,8 +143,6 @@ gbt_bit_consistent(PG_FUNCTION_ARGS)
pfree(q);
}
if (ktst != key)
pfree(key);
if (qtst != query)
pfree(query);
PG_RETURN_BOOL(retval);