diff options
Diffstat (limited to 'src/backend/utils')
-rw-r--r-- | src/backend/utils/adt/regexp.c | 20 | ||||
-rw-r--r-- | src/backend/utils/adt/ri_triggers.c | 36 | ||||
-rw-r--r-- | src/backend/utils/adt/selfuncs.c | 5 | ||||
-rw-r--r-- | src/backend/utils/adt/tsginidx.c | 6 | ||||
-rw-r--r-- | src/backend/utils/adt/tsquery.c | 12 | ||||
-rw-r--r-- | src/backend/utils/adt/tsquery_cleanup.c | 22 | ||||
-rw-r--r-- | src/backend/utils/adt/tsquery_gist.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/tsquery_rewrite.c | 10 | ||||
-rw-r--r-- | src/backend/utils/adt/tsquery_util.c | 28 | ||||
-rw-r--r-- | src/backend/utils/adt/tsrank.c | 18 | ||||
-rw-r--r-- | src/backend/utils/adt/tsvector.c | 10 | ||||
-rw-r--r-- | src/backend/utils/adt/tsvector_parser.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/txid.c | 14 | ||||
-rw-r--r-- | src/backend/utils/adt/uuid.c | 10 | ||||
-rw-r--r-- | src/backend/utils/adt/varlena.c | 16 | ||||
-rw-r--r-- | src/backend/utils/adt/xml.c | 12 | ||||
-rw-r--r-- | src/backend/utils/cache/plancache.c | 24 | ||||
-rw-r--r-- | src/backend/utils/mmgr/portalmem.c | 4 | ||||
-rw-r--r-- | src/backend/utils/resowner/resowner.c | 10 | ||||
-rw-r--r-- | src/backend/utils/time/combocid.c | 6 |
20 files changed, 135 insertions, 136 deletions
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index 3b84a831bde..8255a413d54 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/regexp.c,v 1.76 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/regexp.c,v 1.77 2007/11/15 22:25:16 momjian Exp $ * * Alistair Crooks added the code for the regex caching * agc - cached the regular expressions used - there's a good chance @@ -48,7 +48,7 @@ typedef struct pg_re_flags { int cflags; /* compile flags for Spencer's regex code */ bool glob; /* do it globally (for each occurrence) */ -} pg_re_flags; +} pg_re_flags; /* cross-call state for regexp_matches(), also regexp_split() */ typedef struct regexp_matches_ctx @@ -63,7 +63,7 @@ typedef struct regexp_matches_ctx /* workspace for build_regexp_matches_result() */ Datum *elems; /* has npatterns elements */ bool *nulls; /* has npatterns elements */ -} regexp_matches_ctx; +} regexp_matches_ctx; /* * We cache precompiled regular expressions using a "self organizing list" @@ -113,9 +113,9 @@ static regexp_matches_ctx *setup_regexp_matches(text *orig_str, text *pattern, bool force_glob, bool use_subpatterns, bool ignore_degenerate); -static void cleanup_regexp_matches(regexp_matches_ctx * matchctx); -static ArrayType *build_regexp_matches_result(regexp_matches_ctx * matchctx); -static Datum build_regexp_split_result(regexp_matches_ctx * splitctx); +static void cleanup_regexp_matches(regexp_matches_ctx *matchctx); +static ArrayType *build_regexp_matches_result(regexp_matches_ctx *matchctx); +static Datum build_regexp_split_result(regexp_matches_ctx *splitctx); /* @@ -345,7 +345,7 @@ RE_compile_and_execute(text *text_re, char *dat, int dat_len, * don't want some have to reject them after the fact. */ static void -parse_re_flags(pg_re_flags * flags, text *opts) +parse_re_flags(pg_re_flags *flags, text *opts) { /* regex_flavor is always folded into the compile flags */ flags->cflags = regex_flavor; @@ -981,7 +981,7 @@ setup_regexp_matches(text *orig_str, text *pattern, text *flags, * cleanup_regexp_matches - release memory of a regexp_matches_ctx */ static void -cleanup_regexp_matches(regexp_matches_ctx * matchctx) +cleanup_regexp_matches(regexp_matches_ctx *matchctx) { pfree(matchctx->orig_str); pfree(matchctx->match_locs); @@ -996,7 +996,7 @@ cleanup_regexp_matches(regexp_matches_ctx * matchctx) * build_regexp_matches_result - build output array for current match */ static ArrayType * -build_regexp_matches_result(regexp_matches_ctx * matchctx) +build_regexp_matches_result(regexp_matches_ctx *matchctx) { Datum *elems = matchctx->elems; bool *nulls = matchctx->nulls; @@ -1136,7 +1136,7 @@ regexp_split_to_array_no_flags(PG_FUNCTION_ARGS) * or the string after the last match when next_match == nmatches. */ static Datum -build_regexp_split_result(regexp_matches_ctx * splitctx) +build_regexp_split_result(regexp_matches_ctx *splitctx) { int startpos; int endpos; diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index 5a27f08f3c3..51fa581c742 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -15,7 +15,7 @@ * * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/utils/adt/ri_triggers.c,v 1.98 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/ri_triggers.c,v 1.99 2007/11/15 22:25:16 momjian Exp $ * * ---------- */ @@ -108,7 +108,7 @@ typedef struct RI_ConstraintInfo * PK) */ Oid ff_eq_oprs[RI_MAX_NUMKEYS]; /* equality operators (FK = * FK) */ -} RI_ConstraintInfo; +} RI_ConstraintInfo; /* ---------- @@ -150,7 +150,7 @@ typedef struct RI_CompareKey { Oid eq_opr; /* the equality operator to apply */ Oid typeid; /* the data type to apply it to */ -} RI_CompareKey; +} RI_CompareKey; /* ---------- @@ -163,7 +163,7 @@ typedef struct RI_CompareHashEntry bool valid; /* successfully initialized? */ FmgrInfo eq_opr_finfo; /* call info for equality fn */ FmgrInfo cast_func_finfo; /* in case we must coerce input */ -} RI_CompareHashEntry; +} RI_CompareHashEntry; /* ---------- @@ -188,23 +188,23 @@ static void ri_GenerateQual(StringInfo buf, static int ri_NullCheck(Relation rel, HeapTuple tup, RI_QueryKey *key, int pairidx); static void ri_BuildQueryKeyFull(RI_QueryKey *key, - const RI_ConstraintInfo * riinfo, + const RI_ConstraintInfo *riinfo, int32 constr_queryno); static void ri_BuildQueryKeyPkCheck(RI_QueryKey *key, - const RI_ConstraintInfo * riinfo, + const RI_ConstraintInfo *riinfo, int32 constr_queryno); static bool ri_KeysEqual(Relation rel, HeapTuple oldtup, HeapTuple newtup, - const RI_ConstraintInfo * riinfo, bool rel_is_pk); + const RI_ConstraintInfo *riinfo, bool rel_is_pk); static bool ri_AllKeysUnequal(Relation rel, HeapTuple oldtup, HeapTuple newtup, - const RI_ConstraintInfo * riinfo, bool rel_is_pk); + const RI_ConstraintInfo *riinfo, bool rel_is_pk); static bool ri_OneKeyEqual(Relation rel, int column, HeapTuple oldtup, HeapTuple newtup, - const RI_ConstraintInfo * riinfo, bool rel_is_pk); + const RI_ConstraintInfo *riinfo, bool rel_is_pk); static bool ri_AttributesEqual(Oid eq_opr, Oid typeid, Datum oldvalue, Datum newvalue); static bool ri_Check_Pk_Match(Relation pk_rel, Relation fk_rel, HeapTuple old_row, - const RI_ConstraintInfo * riinfo); + const RI_ConstraintInfo *riinfo); static void ri_InitHashTables(void); static SPIPlanPtr ri_FetchPreparedPlan(RI_QueryKey *key); @@ -213,7 +213,7 @@ static RI_CompareHashEntry *ri_HashCompareOp(Oid eq_opr, Oid typeid); static void ri_CheckTrigger(FunctionCallInfo fcinfo, const char *funcname, int tgkind); -static void ri_FetchConstraintInfo(RI_ConstraintInfo * riinfo, +static void ri_FetchConstraintInfo(RI_ConstraintInfo *riinfo, Trigger *trigger, Relation trig_rel, bool rel_is_pk); static SPIPlanPtr ri_PlanCheck(const char *querystr, int nargs, Oid *argtypes, RI_QueryKey *qkey, Relation fk_rel, Relation pk_rel, @@ -541,7 +541,7 @@ RI_FKey_check_upd(PG_FUNCTION_ARGS) static bool ri_Check_Pk_Match(Relation pk_rel, Relation fk_rel, HeapTuple old_row, - const RI_ConstraintInfo * riinfo) + const RI_ConstraintInfo *riinfo) { SPIPlanPtr qplan; RI_QueryKey qkey; @@ -2945,7 +2945,7 @@ ri_GenerateQual(StringInfo buf, * ---------- */ static void -ri_BuildQueryKeyFull(RI_QueryKey *key, const RI_ConstraintInfo * riinfo, +ri_BuildQueryKeyFull(RI_QueryKey *key, const RI_ConstraintInfo *riinfo, int32 constr_queryno) { int i; @@ -3022,7 +3022,7 @@ ri_CheckTrigger(FunctionCallInfo fcinfo, const char *funcname, int tgkind) * Fetch the pg_constraint entry for the FK constraint, and fill *riinfo */ static void -ri_FetchConstraintInfo(RI_ConstraintInfo * riinfo, +ri_FetchConstraintInfo(RI_ConstraintInfo *riinfo, Trigger *trigger, Relation trig_rel, bool rel_is_pk) { Oid constraintOid = trigger->tgconstraint; @@ -3486,7 +3486,7 @@ ri_ReportViolation(RI_QueryKey *qkey, const char *constrname, * ---------- */ static void -ri_BuildQueryKeyPkCheck(RI_QueryKey *key, const RI_ConstraintInfo * riinfo, +ri_BuildQueryKeyPkCheck(RI_QueryKey *key, const RI_ConstraintInfo *riinfo, int32 constr_queryno) { int i; @@ -3636,7 +3636,7 @@ ri_HashPreparedPlan(RI_QueryKey *key, SPIPlanPtr plan) */ static bool ri_KeysEqual(Relation rel, HeapTuple oldtup, HeapTuple newtup, - const RI_ConstraintInfo * riinfo, bool rel_is_pk) + const RI_ConstraintInfo *riinfo, bool rel_is_pk) { TupleDesc tupdesc = RelationGetDescr(rel); const int16 *attnums; @@ -3694,7 +3694,7 @@ ri_KeysEqual(Relation rel, HeapTuple oldtup, HeapTuple newtup, */ static bool ri_AllKeysUnequal(Relation rel, HeapTuple oldtup, HeapTuple newtup, - const RI_ConstraintInfo * riinfo, bool rel_is_pk) + const RI_ConstraintInfo *riinfo, bool rel_is_pk) { TupleDesc tupdesc = RelationGetDescr(rel); const int16 *attnums; @@ -3756,7 +3756,7 @@ ri_AllKeysUnequal(Relation rel, HeapTuple oldtup, HeapTuple newtup, */ static bool ri_OneKeyEqual(Relation rel, int column, HeapTuple oldtup, HeapTuple newtup, - const RI_ConstraintInfo * riinfo, bool rel_is_pk) + const RI_ConstraintInfo *riinfo, bool rel_is_pk) { TupleDesc tupdesc = RelationGetDescr(rel); const int16 *attnums; diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 299addec85b..103f4dc9d76 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.240 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.241 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -3160,8 +3160,7 @@ convert_string_datum(Datum value, Oid typid) /* * * http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx - * ?FeedbackID=99694 - */ + * ?FeedbackID=99694 */ { char x[1]; diff --git a/src/backend/utils/adt/tsginidx.c b/src/backend/utils/adt/tsginidx.c index d6b9965d1cc..b322b977230 100644 --- a/src/backend/utils/adt/tsginidx.c +++ b/src/backend/utils/adt/tsginidx.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsginidx.c,v 1.6 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsginidx.c,v 1.7 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -113,10 +113,10 @@ typedef struct { QueryItem *frst; bool *mapped_check; -} GinChkVal; +} GinChkVal; static bool -checkcondition_gin(void *checkval, QueryOperand * val) +checkcondition_gin(void *checkval, QueryOperand *val) { GinChkVal *gcv = (GinChkVal *) checkval; diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c index 457468ee0ea..e591b9622f9 100644 --- a/src/backend/utils/adt/tsquery.c +++ b/src/backend/utils/adt/tsquery.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.9 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.10 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -106,7 +106,7 @@ typedef enum PT_OPR = 3, PT_OPEN = 4, PT_CLOSE = 5, -} ts_tokentype; +} ts_tokentype; /* * get token from query string @@ -390,7 +390,7 @@ makepol(TSQueryParserState state, } static void -findoprnd_recurse(QueryItem * ptr, uint32 *pos, int nnodes) +findoprnd_recurse(QueryItem *ptr, uint32 *pos, int nnodes) { /* since this function recurses, it could be driven to stack overflow. */ check_stack_depth(); @@ -435,7 +435,7 @@ findoprnd_recurse(QueryItem * ptr, uint32 *pos, int nnodes) * QueryItems must be in polish (prefix) notation. */ static void -findoprnd(QueryItem * ptr, int size) +findoprnd(QueryItem *ptr, int size) { uint32 pos; @@ -576,7 +576,7 @@ typedef struct char *cur; char *op; int buflen; -} INFIX; +} INFIX; /* Makes sure inf->buf is large enough for adding 'addsize' bytes */ #define RESIZEBUF(inf, addsize) \ @@ -593,7 +593,7 @@ while( ( (inf)->cur - (inf)->buf ) + (addsize) + 1 >= (inf)->buflen ) \ * infix (human-readable) view */ static void -infix(INFIX * in, bool first) +infix(INFIX *in, bool first) { /* since this function recurses, it could be driven to stack overflow. */ check_stack_depth(); diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c index a4ec1bff591..c395a1f2c2a 100644 --- a/src/backend/utils/adt/tsquery_cleanup.c +++ b/src/backend/utils/adt/tsquery_cleanup.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_cleanup.c,v 1.6 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_cleanup.c,v 1.7 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,13 +24,13 @@ typedef struct NODE struct NODE *left; struct NODE *right; QueryItem *valnode; -} NODE; +} NODE; /* * make query tree from plain view of query */ static NODE * -maketree(QueryItem * in) +maketree(QueryItem *in) { NODE *node = (NODE *) palloc(sizeof(NODE)); @@ -53,10 +53,10 @@ typedef struct QueryItem *ptr; int len; /* allocated size of ptr */ int cur; /* number of elements in ptr */ -} PLAINTREE; +} PLAINTREE; static void -plainnode(PLAINTREE * state, NODE * node) +plainnode(PLAINTREE *state, NODE *node) { /* since this function recurses, it could be driven to stack overflow. */ check_stack_depth(); @@ -91,7 +91,7 @@ plainnode(PLAINTREE * state, NODE * node) * make plain view of tree from a NODE-tree representation */ static QueryItem * -plaintree(NODE * root, int *len) +plaintree(NODE *root, int *len) { PLAINTREE pl; @@ -109,7 +109,7 @@ plaintree(NODE * root, int *len) } static void -freetree(NODE * node) +freetree(NODE *node) { /* since this function recurses, it could be driven to stack overflow. */ check_stack_depth(); @@ -130,7 +130,7 @@ freetree(NODE * node) * Operator ! always return TRUE */ static NODE * -clean_NOT_intree(NODE * node) +clean_NOT_intree(NODE *node) { /* since this function recurses, it could be driven to stack overflow. */ check_stack_depth(); @@ -183,7 +183,7 @@ clean_NOT_intree(NODE * node) } QueryItem * -clean_NOT(QueryItem * ptr, int *len) +clean_NOT(QueryItem *ptr, int *len) { NODE *root = maketree(ptr); @@ -214,7 +214,7 @@ clean_NOT(QueryItem * ptr, int *len) * text (stopword) */ static NODE * -clean_fakeval_intree(NODE * node, char *result) +clean_fakeval_intree(NODE *node, char *result) { char lresult = V_UNKNOWN, rresult = V_UNKNOWN; @@ -272,7 +272,7 @@ clean_fakeval_intree(NODE * node, char *result) } QueryItem * -clean_fakeval(QueryItem * ptr, int *len) +clean_fakeval(QueryItem *ptr, int *len) { NODE *root = maketree(ptr); char result = V_UNKNOWN; diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c index 2d79920960f..00faf1591e5 100644 --- a/src/backend/utils/adt/tsquery_gist.c +++ b/src/backend/utils/adt/tsquery_gist.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_gist.c,v 1.2 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_gist.c,v 1.3 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -142,7 +142,7 @@ typedef struct { OffsetNumber pos; int4 cost; -} SPLITCOST; +} SPLITCOST; static int comparecost(const void *a, const void *b) diff --git a/src/backend/utils/adt/tsquery_rewrite.c b/src/backend/utils/adt/tsquery_rewrite.c index 1dedf138b29..c9f4956e617 100644 --- a/src/backend/utils/adt/tsquery_rewrite.c +++ b/src/backend/utils/adt/tsquery_rewrite.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_rewrite.c,v 1.9 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_rewrite.c,v 1.10 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,7 +43,7 @@ addone(int *counters, int last, int total) * by returning either node or a copy of subs. */ static QTNode * -findeq(QTNode * node, QTNode * ex, QTNode * subs, bool *isfind) +findeq(QTNode *node, QTNode *ex, QTNode *subs, bool *isfind) { if ((node->sign & ex->sign) != ex->sign || @@ -174,7 +174,7 @@ findeq(QTNode * node, QTNode * ex, QTNode * subs, bool *isfind) } static QTNode * -dofindsubquery(QTNode * root, QTNode * ex, QTNode * subs, bool *isfind) +dofindsubquery(QTNode *root, QTNode *ex, QTNode *subs, bool *isfind) { /* since this function recurses, it could be driven to stack overflow. */ check_stack_depth(); @@ -193,7 +193,7 @@ dofindsubquery(QTNode * root, QTNode * ex, QTNode * subs, bool *isfind) } static QTNode * -dropvoidsubtree(QTNode * root) +dropvoidsubtree(QTNode *root) { if (!root) @@ -233,7 +233,7 @@ dropvoidsubtree(QTNode * root) } QTNode * -findsubquery(QTNode * root, QTNode * ex, QTNode * subs, bool *isfind) +findsubquery(QTNode *root, QTNode *ex, QTNode *subs, bool *isfind) { bool DidFind = false; diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c index 8d13db8c98c..c18a398bbf2 100644 --- a/src/backend/utils/adt/tsquery_util.c +++ b/src/backend/utils/adt/tsquery_util.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_util.c,v 1.6 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_util.c,v 1.7 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ #include "miscadmin.h" QTNode * -QT2QTN(QueryItem * in, char *operand) +QT2QTN(QueryItem *in, char *operand) { QTNode *node = (QTNode *) palloc0(sizeof(QTNode)); @@ -52,7 +52,7 @@ QT2QTN(QueryItem * in, char *operand) } void -QTNFree(QTNode * in) +QTNFree(QTNode *in) { if (!in) return; @@ -84,7 +84,7 @@ QTNFree(QTNode * in) } int -QTNodeCompare(QTNode * an, QTNode * bn) +QTNodeCompare(QTNode *an, QTNode *bn) { /* since this function recurses, it could be driven to stack overflow. */ check_stack_depth(); @@ -139,7 +139,7 @@ cmpQTN(const void *a, const void *b) } void -QTNSort(QTNode * in) +QTNSort(QTNode *in) { int i; @@ -156,7 +156,7 @@ QTNSort(QTNode * in) } bool -QTNEq(QTNode * a, QTNode * b) +QTNEq(QTNode *a, QTNode *b) { uint32 sign = a->sign & b->sign; @@ -174,7 +174,7 @@ QTNEq(QTNode * a, QTNode * b) * b c */ void -QTNTernary(QTNode * in) +QTNTernary(QTNode *in) { int i; @@ -217,7 +217,7 @@ QTNTernary(QTNode * in) * (Opposite of QTNTernary) */ void -QTNBinary(QTNode * in) +QTNBinary(QTNode *in) { int i; @@ -261,7 +261,7 @@ QTNBinary(QTNode * in) * terminators. */ static void -cntsize(QTNode * in, int *sumlen, int *nnode) +cntsize(QTNode *in, int *sumlen, int *nnode) { /* since this function recurses, it could be driven to stack overflow. */ check_stack_depth(); @@ -285,10 +285,10 @@ typedef struct QueryItem *curitem; char *operand; char *curoperand; -} QTN2QTState; +} QTN2QTState; static void -fillQT(QTN2QTState * state, QTNode * in) +fillQT(QTN2QTState *state, QTNode *in) { /* since this function recurses, it could be driven to stack overflow. */ check_stack_depth(); @@ -325,7 +325,7 @@ fillQT(QTN2QTState * state, QTNode * in) } TSQuery -QTN2QT(QTNode * in) +QTN2QT(QTNode *in) { TSQuery out; int len; @@ -348,7 +348,7 @@ QTN2QT(QTNode * in) } QTNode * -QTNCopy(QTNode * in) +QTNCopy(QTNode *in) { QTNode *out; @@ -383,7 +383,7 @@ QTNCopy(QTNode * in) } void -QTNClearFlags(QTNode * in, uint32 flags) +QTNClearFlags(QTNode *in, uint32 flags) { /* since this function recurses, it could be driven to stack overflow. */ check_stack_depth(); diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c index a918ee3d3ca..6f6f689b99f 100644 --- a/src/backend/utils/adt/tsrank.c +++ b/src/backend/utils/adt/tsrank.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsrank.c,v 1.10 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsrank.c,v 1.11 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,7 +72,7 @@ cnt_length(TSVector t) } static int -WordECompareQueryItem(char *eval, char *qval, WordEntry * ptr, QueryOperand * item) +WordECompareQueryItem(char *eval, char *qval, WordEntry *ptr, QueryOperand *item) { if (ptr->len == item->length) return strncmp( @@ -88,7 +88,7 @@ WordECompareQueryItem(char *eval, char *qval, WordEntry * ptr, QueryOperand * it * is the TSQuery containing 'item'. Returns NULL if not found. */ static WordEntry * -find_wordentry(TSVector t, TSQuery q, QueryOperand * item) +find_wordentry(TSVector t, TSQuery q, QueryOperand *item) { WordEntry *StopLow = ARRPTR(t); WordEntry *StopHigh = (WordEntry *) STRPTR(t); @@ -469,7 +469,7 @@ typedef struct int16 nitem; uint8 wclass; int32 pos; -} DocRepresentation; +} DocRepresentation; static int compareDocR(const void *va, const void *vb) @@ -486,13 +486,13 @@ typedef struct { TSQuery query; bool *operandexist; -} QueryRepresentation; +} QueryRepresentation; #define QR_GET_OPERAND_EXISTS(q, v) ( (q)->operandexist[ ((QueryItem*)(v)) - GETQUERY((q)->query) ] ) #define QR_SET_OPERAND_EXISTS(q, v) QR_GET_OPERAND_EXISTS(q,v) = true static bool -checkcondition_QueryOperand(void *checkval, QueryOperand * val) +checkcondition_QueryOperand(void *checkval, QueryOperand *val) { QueryRepresentation *qr = (QueryRepresentation *) checkval; @@ -506,11 +506,11 @@ typedef struct int q; DocRepresentation *begin; DocRepresentation *end; -} Extention; +} Extention; static bool -Cover(DocRepresentation * doc, int len, QueryRepresentation * qr, Extention * ext) +Cover(DocRepresentation *doc, int len, QueryRepresentation *qr, Extention *ext) { DocRepresentation *ptr; int lastpos = ext->pos; @@ -591,7 +591,7 @@ Cover(DocRepresentation * doc, int len, QueryRepresentation * qr, Extention * ex } static DocRepresentation * -get_docrep(TSVector txt, QueryRepresentation * qr, int *doclen) +get_docrep(TSVector txt, QueryRepresentation *qr, int *doclen) { QueryItem *item = GETQUERY(qr->query); WordEntry *entry; diff --git a/src/backend/utils/adt/tsvector.c b/src/backend/utils/adt/tsvector.c index 7977214b494..a82c6bb44d7 100644 --- a/src/backend/utils/adt/tsvector.c +++ b/src/backend/utils/adt/tsvector.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector.c,v 1.7 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector.c,v 1.8 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,7 +25,7 @@ typedef struct WordEntry entry; /* must be first! */ WordEntryPos *pos; int poslen; /* number of elements in pos */ -} WordEntryIN; +} WordEntryIN; /* Compare two WordEntryPos values for qsort */ @@ -47,7 +47,7 @@ comparePos(const void *a, const void *b) * Returns new length. */ static int -uniquePos(WordEntryPos * a, int l) +uniquePos(WordEntryPos *a, int l) { WordEntryPos *ptr, *res; @@ -100,7 +100,7 @@ compareentry(const void *va, const void *vb, void *arg) * *outbuflen receives the amount of space needed for strings and positions. */ static int -uniqueentry(WordEntryIN * a, int l, char *buf, int *outbuflen) +uniqueentry(WordEntryIN *a, int l, char *buf, int *outbuflen) { int buflen; WordEntryIN *ptr, @@ -171,7 +171,7 @@ uniqueentry(WordEntryIN * a, int l, char *buf, int *outbuflen) } static int -WordEntryCMP(WordEntry * a, WordEntry * b, char *buf) +WordEntryCMP(WordEntry *a, WordEntry *b, char *buf) { return compareentry(a, b, buf); } diff --git a/src/backend/utils/adt/tsvector_parser.c b/src/backend/utils/adt/tsvector_parser.c index d1d4a792953..5cb6a739b88 100644 --- a/src/backend/utils/adt/tsvector_parser.c +++ b/src/backend/utils/adt/tsvector_parser.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_parser.c,v 1.3 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_parser.c,v 1.4 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -157,7 +157,7 @@ prssyntaxerror(TSVectorParseState state) bool gettoken_tsvector(TSVectorParseState state, char **strval, int *lenval, - WordEntryPos ** pos_ptr, int *poslen, + WordEntryPos **pos_ptr, int *poslen, char **endptr) { int oldstate = 0; diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c index 4fc2276ece7..277f572d9d8 100644 --- a/src/backend/utils/adt/txid.c +++ b/src/backend/utils/adt/txid.c @@ -14,7 +14,7 @@ * Author: Jan Wieck, Afilias USA INC. * 64-bit txids: Marko Kreen, Skype Technologies * - * $PostgreSQL: pgsql/src/backend/utils/adt/txid.c,v 1.2 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/txid.c,v 1.3 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,7 +65,7 @@ typedef struct txid xmin; txid xmax; txid xip[1]; /* in-progress txids, xmin <= xip[i] < xmax */ -} TxidSnapshot; +} TxidSnapshot; #define TXID_SNAPSHOT_SIZE(nxip) \ (offsetof(TxidSnapshot, xip) + sizeof(txid) * (nxip)) @@ -77,14 +77,14 @@ typedef struct { TransactionId last_xid; uint32 epoch; -} TxidEpoch; +} TxidEpoch; /* * Fetch epoch data from xact.c. */ static void -load_xid_epoch(TxidEpoch * state) +load_xid_epoch(TxidEpoch *state) { GetNextXidAndEpoch(&state->last_xid, &state->epoch); } @@ -93,7 +93,7 @@ load_xid_epoch(TxidEpoch * state) * do a TransactionId -> txid conversion for an XID near the given epoch */ static txid -convert_xid(TransactionId xid, const TxidEpoch * state) +convert_xid(TransactionId xid, const TxidEpoch *state) { #ifndef INT64_IS_BUSTED uint64 epoch; @@ -141,7 +141,7 @@ cmp_txid(const void *aa, const void *bb) * will not be used. */ static void -sort_snapshot(TxidSnapshot * snap) +sort_snapshot(TxidSnapshot *snap) { if (snap->nxip > 1) qsort(snap->xip, snap->nxip, sizeof(txid), cmp_txid); @@ -151,7 +151,7 @@ sort_snapshot(TxidSnapshot * snap) * check txid visibility. */ static bool -is_visible_txid(txid value, const TxidSnapshot * snap) +is_visible_txid(txid value, const TxidSnapshot *snap) { if (value < snap->xmin) return true; diff --git a/src/backend/utils/adt/uuid.c b/src/backend/utils/adt/uuid.c index 24ce92e751a..9068966e7fa 100644 --- a/src/backend/utils/adt/uuid.c +++ b/src/backend/utils/adt/uuid.c @@ -6,7 +6,7 @@ * Copyright (c) 2007, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/uuid.c,v 1.5 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/uuid.c,v 1.6 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,8 +27,8 @@ struct pg_uuid_t unsigned char data[UUID_LEN]; }; -static void string_to_uuid(const char *source, pg_uuid_t * uuid); -static int uuid_internal_cmp(const pg_uuid_t * arg1, const pg_uuid_t * arg2); +static void string_to_uuid(const char *source, pg_uuid_t *uuid); +static int uuid_internal_cmp(const pg_uuid_t *arg1, const pg_uuid_t *arg2); Datum uuid_in(PG_FUNCTION_ARGS) @@ -80,7 +80,7 @@ uuid_out(PG_FUNCTION_ARGS) * two formats into the latter format before further processing. */ static void -string_to_uuid(const char *source, pg_uuid_t * uuid) +string_to_uuid(const char *source, pg_uuid_t *uuid) { char hex_buf[32]; /* not NUL terminated */ int i; @@ -161,7 +161,7 @@ uuid_send(PG_FUNCTION_ARGS) /* internal uuid compare function */ static int -uuid_internal_cmp(const pg_uuid_t * arg1, const pg_uuid_t * arg2) +uuid_internal_cmp(const pg_uuid_t *arg1, const pg_uuid_t *arg2) { return memcmp(arg1->data, arg2->data, UUID_LEN); } diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index e71bb81f838..044378437ec 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.160 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.161 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,7 +40,7 @@ typedef struct pg_wchar *wstr2; /* note: these are palloc'd */ int len1; /* string lengths in logical characters */ int len2; -} TextPositionState; +} TextPositionState; #define DatumGetUnknownP(X) ((unknown *) PG_DETOAST_DATUM(X)) #define DatumGetUnknownPCopy(X) ((unknown *) PG_DETOAST_DATUM_COPY(X)) @@ -60,9 +60,9 @@ typedef struct static int text_cmp(text *arg1, text *arg2); static int32 text_length(Datum str); static int text_position(text *t1, text *t2); -static void text_position_setup(text *t1, text *t2, TextPositionState * state); -static int text_position_next(int start_pos, TextPositionState * state); -static void text_position_cleanup(TextPositionState * state); +static void text_position_setup(text *t1, text *t2, TextPositionState *state); +static int text_position_next(int start_pos, TextPositionState *state); +static void text_position_cleanup(TextPositionState *state); static text *text_substring(Datum str, int32 start, int32 length, @@ -807,7 +807,7 @@ text_position(text *t1, text *t2) */ static void -text_position_setup(text *t1, text *t2, TextPositionState * state) +text_position_setup(text *t1, text *t2, TextPositionState *state) { int len1 = VARSIZE_ANY_EXHDR(t1); int len2 = VARSIZE_ANY_EXHDR(t2); @@ -841,7 +841,7 @@ text_position_setup(text *t1, text *t2, TextPositionState * state) } static int -text_position_next(int start_pos, TextPositionState * state) +text_position_next(int start_pos, TextPositionState *state) { int pos = 0, p, @@ -899,7 +899,7 @@ text_position_next(int start_pos, TextPositionState * state) } static void -text_position_cleanup(TextPositionState * state) +text_position_cleanup(TextPositionState *state) { if (state->use_wchar) { diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 98fe39871f5..a453f76bb37 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.57 2007/11/15 21:14:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.58 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -186,7 +186,7 @@ xml_in(PG_FUNCTION_ARGS) static char * -xml_out_internal(xmltype * x, pg_enc target_encoding) +xml_out_internal(xmltype *x, pg_enc target_encoding) { char *str; size_t len; @@ -540,7 +540,7 @@ xmltotext(PG_FUNCTION_ARGS) text * -xmltotext_with_xmloption(xmltype * data, XmlOptionType xmloption_arg) +xmltotext_with_xmloption(xmltype *data, XmlOptionType xmloption_arg) { if (xmloption_arg == XMLOPTION_DOCUMENT && !xml_is_document(data)) ereport(ERROR, @@ -553,7 +553,7 @@ xmltotext_with_xmloption(xmltype * data, XmlOptionType xmloption_arg) xmltype * -xmlelement(XmlExprState * xmlExpr, ExprContext *econtext) +xmlelement(XmlExprState *xmlExpr, ExprContext *econtext) { #ifdef USE_LIBXML XmlExpr *xexpr = (XmlExpr *) xmlExpr->xprstate.expr; @@ -721,7 +721,7 @@ xmlpi(char *target, text *arg, bool arg_is_null, bool *result_is_null) xmltype * -xmlroot(xmltype * data, text *version, int standalone) +xmlroot(xmltype *data, text *version, int standalone) { #ifdef USE_LIBXML char *str; @@ -871,7 +871,7 @@ xmlvalidate(PG_FUNCTION_ARGS) bool -xml_is_document(xmltype * arg) +xml_is_document(xmltype *arg) { #ifdef USE_LIBXML bool result; diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c index b299bc659b2..8e0fff93941 100644 --- a/src/backend/utils/cache/plancache.c +++ b/src/backend/utils/cache/plancache.c @@ -33,7 +33,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/plancache.c,v 1.13 2007/11/15 21:14:40 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/plancache.c,v 1.14 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,18 +57,18 @@ typedef struct { void (*callback) (); void *arg; -} ScanQueryWalkerContext; +} ScanQueryWalkerContext; typedef struct { Oid inval_relid; CachedPlan *plan; -} InvalRelidContext; +} InvalRelidContext; static List *cached_plans_list = NIL; -static void StoreCachedPlan(CachedPlanSource * plansource, List *stmt_list, +static void StoreCachedPlan(CachedPlanSource *plansource, List *stmt_list, MemoryContext plan_context); static List *do_planning(List *querytrees, int cursorOptions); static void AcquireExecutorLocks(List *stmt_list, bool acquire); @@ -78,12 +78,12 @@ static void UnlockRelid(Oid relid, LOCKMODE lockmode, void *arg); static void ScanQueryForRelids(Query *parsetree, void (*callback) (), void *arg); -static bool ScanQueryWalker(Node *node, ScanQueryWalkerContext * context); +static bool ScanQueryWalker(Node *node, ScanQueryWalkerContext *context); static bool rowmark_member(List *rowMarks, int rt_index); static bool plan_list_is_transient(List *stmt_list); static void PlanCacheCallback(Datum arg, Oid relid); static void InvalRelid(Oid relid, LOCKMODE lockmode, - InvalRelidContext * context); + InvalRelidContext *context); /* @@ -284,7 +284,7 @@ FastCreateCachedPlan(Node *raw_parse_tree, * Common subroutine for CreateCachedPlan and RevalidateCachedPlan. */ static void -StoreCachedPlan(CachedPlanSource * plansource, +StoreCachedPlan(CachedPlanSource *plansource, List *stmt_list, MemoryContext plan_context) { @@ -350,7 +350,7 @@ StoreCachedPlan(CachedPlanSource * plansource, * still in use. */ void -DropCachedPlan(CachedPlanSource * plansource) +DropCachedPlan(CachedPlanSource *plansource) { /* Validity check that we were given a CachedPlanSource */ Assert(list_member_ptr(cached_plans_list, plansource)); @@ -393,7 +393,7 @@ DropCachedPlan(CachedPlanSource * plansource) * is used for that work. */ CachedPlan * -RevalidateCachedPlan(CachedPlanSource * plansource, bool useResOwner) +RevalidateCachedPlan(CachedPlanSource *plansource, bool useResOwner) { CachedPlan *plan; @@ -591,7 +591,7 @@ do_planning(List *querytrees, int cursorOptions) * Portal. Transient references should be protected by a resource owner. */ void -ReleaseCachedPlan(CachedPlan * plan, bool useResOwner) +ReleaseCachedPlan(CachedPlan *plan, bool useResOwner) { if (useResOwner) ResourceOwnerForgetPlanCacheRef(CurrentResourceOwner, plan); @@ -767,7 +767,7 @@ ScanQueryForRelids(Query *parsetree, * Walker to find sublink subqueries for ScanQueryForRelids */ static bool -ScanQueryWalker(Node *node, ScanQueryWalkerContext * context) +ScanQueryWalker(Node *node, ScanQueryWalkerContext *context) { if (node == NULL) return false; @@ -970,7 +970,7 @@ ResetPlanCache(void) * ScanQueryForRelids callback function for PlanCacheCallback */ static void -InvalRelid(Oid relid, LOCKMODE lockmode, InvalRelidContext * context) +InvalRelid(Oid relid, LOCKMODE lockmode, InvalRelidContext *context) { if (relid == context->inval_relid || context->inval_relid == InvalidOid) context->plan->dead = true; diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index 676012e3293..efe49c0e0b9 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -12,7 +12,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.104 2007/11/15 21:14:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.105 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -292,7 +292,7 @@ PortalDefineQuery(Portal portal, const char *sourceText, const char *commandTag, List *stmts, - CachedPlan * cplan) + CachedPlan *cplan) { AssertArg(PortalIsValid(portal)); AssertState(portal->status == PORTAL_NEW); diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c index a88fe9c05ee..0e0cf7e951c 100644 --- a/src/backend/utils/resowner/resowner.c +++ b/src/backend/utils/resowner/resowner.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/resowner/resowner.c,v 1.25 2007/11/15 21:14:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/resowner/resowner.c,v 1.26 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -95,7 +95,7 @@ static void ResourceOwnerReleaseInternal(ResourceOwner owner, bool isCommit, bool isTopLevel); static void PrintRelCacheLeakWarning(Relation rel); -static void PrintPlanCacheLeakWarning(CachedPlan * plan); +static void PrintPlanCacheLeakWarning(CachedPlan *plan); static void PrintTupleDescLeakWarning(TupleDesc tupdesc); @@ -811,7 +811,7 @@ ResourceOwnerEnlargePlanCacheRefs(ResourceOwner owner) * Caller must have previously done ResourceOwnerEnlargePlanCacheRefs() */ void -ResourceOwnerRememberPlanCacheRef(ResourceOwner owner, CachedPlan * plan) +ResourceOwnerRememberPlanCacheRef(ResourceOwner owner, CachedPlan *plan) { Assert(owner->nplanrefs < owner->maxplanrefs); owner->planrefs[owner->nplanrefs] = plan; @@ -822,7 +822,7 @@ ResourceOwnerRememberPlanCacheRef(ResourceOwner owner, CachedPlan * plan) * Forget that a plancache reference is owned by a ResourceOwner */ void -ResourceOwnerForgetPlanCacheRef(ResourceOwner owner, CachedPlan * plan) +ResourceOwnerForgetPlanCacheRef(ResourceOwner owner, CachedPlan *plan) { CachedPlan **planrefs = owner->planrefs; int np1 = owner->nplanrefs - 1; @@ -849,7 +849,7 @@ ResourceOwnerForgetPlanCacheRef(ResourceOwner owner, CachedPlan * plan) * Debugging subroutine */ static void -PrintPlanCacheLeakWarning(CachedPlan * plan) +PrintPlanCacheLeakWarning(CachedPlan *plan) { elog(WARNING, "plancache reference leak: plan %p not closed", plan); } diff --git a/src/backend/utils/time/combocid.c b/src/backend/utils/time/combocid.c index a26823fe441..1d49c375a6e 100644 --- a/src/backend/utils/time/combocid.c +++ b/src/backend/utils/time/combocid.c @@ -34,7 +34,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/time/combocid.c,v 1.2 2007/11/15 21:14:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/time/combocid.c,v 1.3 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,7 +56,7 @@ typedef struct { CommandId cmin; CommandId cmax; -} ComboCidKeyData; +} ComboCidKeyData; typedef ComboCidKeyData *ComboCidKey; @@ -64,7 +64,7 @@ typedef struct { ComboCidKeyData key; CommandId combocid; -} ComboCidEntryData; +} ComboCidEntryData; typedef ComboCidEntryData *ComboCidEntry; |