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

Replace int2/int4 in C code with int16/int32

Browse Source 
The latter was already the dominant use, and it's preferable because
in C the convention is that intXX means XX bits.  Therefore, allowing
mixed use of int2, int4, int8, int16, int32 is obviously confusing.

Remove the typedefs for int2 and int4 for now.  They don't seem to be
widely used outside of the PostgreSQL source tree, and the few uses
can probably be cleaned up by the time this ships.
This commit is contained in:
Peter Eisentraut
2012-06-25 01:51:46 +03:00
parent 7eb8c78514
commit b8b2e3b2de
75 changed files with 411 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
contrib/ltree/_ltree_gist.c
View File

@ -83,7 +83,7 @@ _ltree_compress(PG_FUNCTION_ARGS)
{ /* ltree */
ltree_gist *key;
ArrayType *val = DatumGetArrayTypeP(entry->key);
int4 len = LTG_HDRSIZE + ASIGLEN;
int32 len = LTG_HDRSIZE + ASIGLEN;
int num = ArrayGetNItems(ARR_NDIM(val), ARR_DIMS(val));
ltree *item = (ltree *) ARR_DATA_PTR(val);
@ -115,7 +115,7 @@ _ltree_compress(PG_FUNCTION_ARGS)
}
else if (!LTG_ISALLTRUE(entry->key))
{
int4 i,
int32 i,
len;
ltree_gist *key;
@ -154,7 +154,7 @@ _ltree_same(PG_FUNCTION_ARGS)
*result = false;
else
{
int4 i;
int32 i;
BITVECP sa = LTG_SIGN(a),
sb = LTG_SIGN(b);
@ -171,10 +171,10 @@ _ltree_same(PG_FUNCTION_ARGS)
PG_RETURN_POINTER(result);
}
static int4
static int32
unionkey(BITVECP sbase, ltree_gist *add)
{
int4 i;
int32 i;
BITVECP sadd = LTG_SIGN(add);
if (LTG_ISALLTRUE(add))
@ -191,9 +191,9 @@ _ltree_union(PG_FUNCTION_ARGS)
GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
int *size = (int *) PG_GETARG_POINTER(1);
ABITVEC base;
int4 i,
int32 i,
len;
int4 flag = 0;
int32 flag = 0;
ltree_gist *result;
MemSet((void *) base, 0, sizeof(ABITVEC));
@ -217,10 +217,10 @@ _ltree_union(PG_FUNCTION_ARGS)
PG_RETURN_POINTER(result);
}
static int4
static int32
sizebitvec(BITVECP sign)
{
int4 size = 0,
int32 size = 0,
i;
ALOOPBYTE
@ -274,7 +274,7 @@ _ltree_penalty(PG_FUNCTION_ARGS)
typedef struct
{
OffsetNumber pos;
int4 cost;
int32 cost;
} SPLITCOST;
static int
@ -294,11 +294,11 @@ _ltree_picksplit(PG_FUNCTION_ARGS)
*datum_r;
BITVECP union_l,
union_r;
int4 size_alpha,
int32 size_alpha,
size_beta;
int4 size_waste,
int32 size_waste,
waste = -1;
int4 nbytes;
int32 nbytes;
OffsetNumber seed_1 = 0,
seed_2 = 0;
OffsetNumber *left,

16
contrib/ltree/ltree.h
View File

@ -30,7 +30,7 @@ typedef struct
typedef struct
{
int4 val;
int32 val;
uint16 len;
uint8 flag;
char name[1];
@ -89,9 +89,9 @@ typedef struct
*/
typedef struct ITEM
{
int2 type;
int2 left;
int4 val;
int16 type;
int16 left;
int32 val;
uint8 flag;
/* user-friendly value */
uint8 length;
@ -105,11 +105,11 @@ typedef struct ITEM
typedef struct
{
int32 vl_len_; /* varlena header (do not touch directly!) */
int4 size;
int32 size;
char data[1];
} ltxtquery;
#define HDRSIZEQT MAXALIGN(VARHDRSZ + sizeof(int4))
#define HDRSIZEQT MAXALIGN(VARHDRSZ + sizeof(int32))
#define COMPUTESIZE(size,lenofoperand) ( HDRSIZEQT + (size) * sizeof(ITEM) + (lenofoperand) )
#define GETQUERY(x) (ITEM*)( (char*)(x)+HDRSIZEQT )
#define GETOPERAND(x) ( (char*)GETQUERY(x) + ((ltxtquery*)x)->size * sizeof(ITEM) )
@ -173,7 +173,7 @@ int ltree_strncasecmp(const char *a, const char *b, size_t s);
#define BITBYTE 8
#define SIGLENINT 2
#define SIGLEN ( sizeof(int4)*SIGLENINT )
#define SIGLEN ( sizeof(int32)*SIGLENINT )
#define SIGLENBIT (SIGLEN*BITBYTE)
typedef unsigned char BITVEC[SIGLEN];
typedef unsigned char *BITVECP;
@ -229,7 +229,7 @@ typedef struct
/* GiST support for ltree[] */
#define ASIGLENINT (7)
#define ASIGLEN (sizeof(int4)*ASIGLENINT)
#define ASIGLEN (sizeof(int32)*ASIGLENINT)
#define ASIGLENBIT (ASIGLEN*BITBYTE)
typedef unsigned char ABITVEC[ASIGLEN];

12
contrib/ltree/ltree_gist.c
View File

@ -70,7 +70,7 @@ ltree_compress(PG_FUNCTION_ARGS)
{ /* ltree */
ltree_gist *key;
ltree *val = (ltree *) DatumGetPointer(PG_DETOAST_DATUM(entry->key));
int4 len = LTG_HDRSIZE + VARSIZE(val);
int32 len = LTG_HDRSIZE + VARSIZE(val);
key = (ltree_gist *) palloc(len);
SET_VARSIZE(key, len);
@ -118,7 +118,7 @@ ltree_same(PG_FUNCTION_ARGS)
*result = (ISEQ(LTG_NODE(a), LTG_NODE(b))) ? true : false;
else
{
int4 i;
int32 i;
BITVECP sa = LTG_SIGN(a),
sb = LTG_SIGN(b);
@ -169,7 +169,7 @@ ltree_union(PG_FUNCTION_ARGS)
GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
int *size = (int *) PG_GETARG_POINTER(1);
BITVEC base;
int4 i,
int32 i,
j;
ltree_gist *result,
*cur;
@ -253,7 +253,7 @@ ltree_penalty(PG_FUNCTION_ARGS)
ltree_gist *origval = (ltree_gist *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
ltree_gist *newval = (ltree_gist *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
float *penalty = (float *) PG_GETARG_POINTER(2);
int4 cmpr,
int32 cmpr,
cmpl;
cmpl = ltree_compare(LTG_GETLNODE(origval), LTG_GETLNODE(newval));
@ -287,7 +287,7 @@ ltree_picksplit(PG_FUNCTION_ARGS)
GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
GIST_SPLITVEC *v = (GIST_SPLITVEC *) PG_GETARG_POINTER(1);
OffsetNumber j;
int4 i;
int32 i;
RIX *array;
OffsetNumber maxoff;
int nbytes;
@ -441,7 +441,7 @@ ltree_picksplit(PG_FUNCTION_ARGS)
static bool
gist_isparent(ltree_gist *key, ltree *query)
{
int4 numlevel = query->numlevel;
int32 numlevel = query->numlevel;
int i;
for (i = query->numlevel; i >= 0; i--)

8
contrib/ltree/ltree_op.c
View File

@ -200,7 +200,7 @@ ltree_risparent(PG_FUNCTION_ARGS)
static ltree *
inner_subltree(ltree *t, int4 startpos, int4 endpos)
inner_subltree(ltree *t, int32 startpos, int32 endpos)
{
char *start = NULL,
*end = NULL;
@ -252,9 +252,9 @@ Datum
subpath(PG_FUNCTION_ARGS)
{
ltree *t = PG_GETARG_LTREE(0);
int4 start = PG_GETARG_INT32(1);
int4 len = (fcinfo->nargs == 3) ? PG_GETARG_INT32(2) : 0;
int4 end;
int32 start = PG_GETARG_INT32(1);
int32 len = (fcinfo->nargs == 3) ? PG_GETARG_INT32(2) : 0;
int32 end;
ltree *res;
end = start + len;

74
contrib/ltree/ltxtquery_io.c
View File

@ -28,10 +28,10 @@ Datum ltxtq_out(PG_FUNCTION_ARGS);
*/
typedef struct NODE
{
int4 type;
int4 val;
int2 distance;
int2 length;
int32 type;
int32 val;
int16 distance;
int16 length;
uint16 flag;
struct NODE *next;
} NODE;
@ -39,16 +39,16 @@ typedef struct NODE
typedef struct
{
char *buf;
int4 state;
int4 count;
int32 state;
int32 count;
/* reverse polish notation in list (for temporary usage) */
NODE *str;
/* number in str */
int4 num;
int32 num;
/* user-friendly operand */
int4 lenop;
int4 sumlen;
int32 lenop;
int32 sumlen;
char *op;
char *curop;
} QPRS_STATE;
@ -56,8 +56,8 @@ typedef struct
/*
* get token from query string
*/
static int4
gettoken_query(QPRS_STATE *state, int4 *val, int4 *lenval, char **strval, uint16 *flag)
static int32
gettoken_query(QPRS_STATE *state, int32 *val, int32 *lenval, char **strval, uint16 *flag)
{
int charlen;
@ -71,7 +71,7 @@ gettoken_query(QPRS_STATE *state, int4 *val, int4 *lenval, char **strval, uint16
if (charlen == 1 && t_iseq(state->buf, '!'))
{
(state->buf)++;
*val = (int4) '!';
*val = (int32) '!';
return OPR;
}
else if (charlen == 1 && t_iseq(state->buf, '('))
@ -117,7 +117,7 @@ gettoken_query(QPRS_STATE *state, int4 *val, int4 *lenval, char **strval, uint16
if (charlen == 1 && (t_iseq(state->buf, '&') || t_iseq(state->buf, '|')))
{
state->state = WAITOPERAND;
*val = (int4) *(state->buf);
*val = (int32) *(state->buf);
(state->buf)++;
return OPR;
}
@ -146,7 +146,7 @@ gettoken_query(QPRS_STATE *state, int4 *val, int4 *lenval, char **strval, uint16
* push new one in polish notation reverse view
*/
static void
pushquery(QPRS_STATE *state, int4 type, int4 val, int4 distance, int4 lenval, uint16 flag)
pushquery(QPRS_STATE *state, int32 type, int32 val, int32 distance, int32 lenval, uint16 flag)
{
NODE *tmp = (NODE *) palloc(sizeof(NODE));
@ -184,7 +184,7 @@ pushval_asis(QPRS_STATE *state, int type, char *strval, int lenval, uint16 flag)
while (state->curop - state->op + lenval + 1 >= state->lenop)
{
int4 tmp = state->curop - state->op;
int32 tmp = state->curop - state->op;
state->lenop *= 2;
state->op = (char *) repalloc((void *) state->op, state->lenop);
@ -202,15 +202,15 @@ pushval_asis(QPRS_STATE *state, int type, char *strval, int lenval, uint16 flag)
/*
* make polish notaion of query
*/
static int4
static int32
makepol(QPRS_STATE *state)
{
int4 val = 0,
int32 val = 0,
type;
int4 lenval = 0;
int32 lenval = 0;
char *strval = NULL;
int4 stack[STACKDEPTH];
int4 lenstack = 0;
int32 stack[STACKDEPTH];
int32 lenstack = 0;
uint16 flag = 0;
while ((type = gettoken_query(state, &val, &lenval, &strval, &flag)) != END)
@ -219,15 +219,15 @@ makepol(QPRS_STATE *state)
{
case VAL:
pushval_asis(state, VAL, strval, lenval, flag);
while (lenstack && (stack[lenstack - 1] == (int4) '&' ||
stack[lenstack - 1] == (int4) '!'))
while (lenstack && (stack[lenstack - 1] == (int32) '&' ||
stack[lenstack - 1] == (int32) '!'))
{
lenstack--;
pushquery(state, OPR, stack[lenstack], 0, 0, 0);
}
break;
case OPR:
if (lenstack && val == (int4) '|')
if (lenstack && val == (int32) '|')
pushquery(state, OPR, val, 0, 0, 0);
else
{
@ -241,8 +241,8 @@ makepol(QPRS_STATE *state)
case OPEN:
if (makepol(state) == ERR)
return ERR;
while (lenstack && (stack[lenstack - 1] == (int4) '&' ||
stack[lenstack - 1] == (int4) '!'))
while (lenstack && (stack[lenstack - 1] == (int32) '&' ||
stack[lenstack - 1] == (int32) '!'))
{
lenstack--;
pushquery(state, OPR, stack[lenstack], 0, 0, 0);
@ -275,14 +275,14 @@ makepol(QPRS_STATE *state)
}
static void
findoprnd(ITEM *ptr, int4 *pos)
findoprnd(ITEM *ptr, int32 *pos)
{
if (ptr[*pos].type == VAL || ptr[*pos].type == VALTRUE)
{
ptr[*pos].left = 0;
(*pos)++;
}
else if (ptr[*pos].val == (int4) '!')
else if (ptr[*pos].val == (int32) '!')
{
ptr[*pos].left = 1;
(*pos)++;
@ -291,7 +291,7 @@ findoprnd(ITEM *ptr, int4 *pos)
else
{
ITEM *curitem = &ptr[*pos];
int4 tmp = *pos;
int32 tmp = *pos;
(*pos)++;
findoprnd(ptr, pos);
@ -308,12 +308,12 @@ static ltxtquery *
queryin(char *buf)
{
QPRS_STATE state;
int4 i;
int32 i;
ltxtquery *query;
int4 commonlen;
int32 commonlen;
ITEM *ptr;
NODE *tmp;
int4 pos = 0;
int32 pos = 0;
#ifdef BS_DEBUG
char pbuf[16384],
@ -390,13 +390,13 @@ typedef struct
char *buf;
char *cur;
char *op;
int4 buflen;
int32 buflen;
} INFIX;
#define RESIZEBUF(inf,addsize) \
while( ( (inf)->cur - (inf)->buf ) + (addsize) + 1 >= (inf)->buflen ) \
{ \
int4 len = (inf)->cur - (inf)->buf; \
int32 len = (inf)->cur - (inf)->buf; \
(inf)->buflen *= 2; \
(inf)->buf = (char*) repalloc( (void*)(inf)->buf, (inf)->buflen ); \
(inf)->cur = (inf)->buf + len; \
@ -438,7 +438,7 @@ infix(INFIX *in, bool first)
*(in->cur) = '\0';
in->curpol++;
}
else if (in->curpol->val == (int4) '!')
else if (in->curpol->val == (int32) '!')
{
bool isopr = false;
@ -464,11 +464,11 @@ infix(INFIX *in, bool first)
}
else
{
int4 op = in->curpol->val;
int32 op = in->curpol->val;
INFIX nrm;
in->curpol++;
if (op == (int4) '|' && !first)
if (op == (int32) '|' && !first)
{
RESIZEBUF(in, 2);
sprintf(in->cur, "( ");
@ -493,7 +493,7 @@ infix(INFIX *in, bool first)
in->cur = strchr(in->cur, '\0');
pfree(nrm.buf);
if (op == (int4) '|' && !first)
if (op == (int32) '|' && !first)
{
RESIZEBUF(in, 2);
sprintf(in->cur, " )");

4
contrib/ltree/ltxtquery_op.c
View File

@ -20,13 +20,13 @@ ltree_execute(ITEM *curitem, void *checkval, bool calcnot, bool (*chkcond) (void
{
if (curitem->type == VAL)
return (*chkcond) (checkval, curitem);
else if (curitem->val == (int4) '!')
else if (curitem->val == (int32) '!')
{
return (calcnot) ?
((ltree_execute(curitem + 1, checkval, calcnot, chkcond)) ? false : true)
: true;
}
else if (curitem->val == (int4) '&')
else if (curitem->val == (int32) '&')
{
if (ltree_execute(curitem + curitem->left, checkval, calcnot, chkcond))
return ltree_execute(curitem + 1, checkval, calcnot, chkcond);