diff options
124 files changed, 751 insertions, 750 deletions
diff --git a/contrib/dict_xsyn/dict_xsyn.c b/contrib/dict_xsyn/dict_xsyn.c index 753886117da..6dd0f6a5b35 100644 --- a/contrib/dict_xsyn/dict_xsyn.c +++ b/contrib/dict_xsyn/dict_xsyn.c @@ -6,7 +6,7 @@ * Copyright (c) 2007, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/dict_xsyn/dict_xsyn.c,v 1.2 2007/11/15 21:14:29 momjian Exp $ + * $PostgreSQL: pgsql/contrib/dict_xsyn/dict_xsyn.c,v 1.3 2007/11/15 22:25:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ typedef struct char *key; /* Word */ char *value; /* Unparsed list of synonyms, including the * word itself */ -} Syn; +} Syn; typedef struct { @@ -35,7 +35,7 @@ typedef struct Syn *syn; bool keeporig; -} DictSyn; +} DictSyn; PG_FUNCTION_INFO_V1(dxsyn_init); @@ -72,7 +72,7 @@ compare_syn(const void *a, const void *b) } static void -read_dictionary(DictSyn * d, char *filename) +read_dictionary(DictSyn *d, char *filename) { char *real_filename = get_tsearch_config_filename(filename, "rules"); FILE *fin; diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c index 2a9d80bfdbc..2344d0b50be 100644 --- a/contrib/intarray/_int_bool.c +++ b/contrib/intarray/_int_bool.c @@ -36,7 +36,7 @@ typedef struct NODE int4 type; int4 val; struct NODE *next; -} NODE; +} NODE; typedef struct { @@ -226,7 +226,7 @@ typedef struct { int4 *arrb; int4 *arre; -} CHKVAL; +} CHKVAL; /* * is there value 'val' in array or not ? @@ -323,7 +323,7 @@ typedef struct { ITEM *first; bool *mapped_check; -} GinChkVal; +} GinChkVal; static bool checkcondition_gin(void *checkval, ITEM * item) @@ -506,7 +506,7 @@ typedef struct char *buf; char *cur; int4 buflen; -} INFIX; +} INFIX; #define RESIZEBUF(inf,addsize) while( ( (inf)->cur - (inf)->buf ) + (addsize) + 1 >= (inf)->buflen ) { \ int4 len = inf->cur - inf->buf; \ @@ -516,7 +516,7 @@ typedef struct } static void -infix(INFIX * in, bool first) +infix(INFIX *in, bool first) { if (in->curpol->type == VAL) { diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c index 51cc77b863d..abd576223e8 100644 --- a/contrib/intarray/_int_gist.c +++ b/contrib/intarray/_int_gist.c @@ -343,7 +343,7 @@ typedef struct { OffsetNumber pos; float cost; -} SPLITCOST; +} SPLITCOST; static int comparecost(const void *a, const void *b) diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c index 904d4490dc9..6c9a63d5dbb 100644 --- a/contrib/ltree/ltxtquery_io.c +++ b/contrib/ltree/ltxtquery_io.c @@ -1,7 +1,7 @@ /* * txtquery io * Teodor Sigaev <teodor@stack.net> - * $PostgreSQL: pgsql/contrib/ltree/ltxtquery_io.c,v 1.13 2007/02/28 22:44:38 tgl Exp $ + * $PostgreSQL: pgsql/contrib/ltree/ltxtquery_io.c,v 1.14 2007/11/15 22:25:14 momjian Exp $ */ #include "ltree.h" @@ -32,7 +32,7 @@ typedef struct NODE int2 length; uint16 flag; struct NODE *next; -} NODE; +} NODE; typedef struct { @@ -384,7 +384,7 @@ typedef struct char *cur; char *op; int4 buflen; -} INFIX; +} INFIX; #define RESIZEBUF(inf,addsize) \ while( ( (inf)->cur - (inf)->buf ) + (addsize) + 1 >= (inf)->buflen ) \ @@ -400,7 +400,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) { if (in->curpol->type == VAL) { diff --git a/contrib/ltree/ltxtquery_op.c b/contrib/ltree/ltxtquery_op.c index 07ebc201c7a..2797f863750 100644 --- a/contrib/ltree/ltxtquery_op.c +++ b/contrib/ltree/ltxtquery_op.c @@ -1,7 +1,7 @@ /* * txtquery operations with ltree * Teodor Sigaev <teodor@stack.net> - * $PostgreSQL: pgsql/contrib/ltree/ltxtquery_op.c,v 1.6 2006/03/11 04:38:29 momjian Exp $ + * $PostgreSQL: pgsql/contrib/ltree/ltxtquery_op.c,v 1.7 2007/11/15 22:25:14 momjian Exp $ */ #include "ltree.h" @@ -45,7 +45,7 @@ typedef struct { ltree *node; char *operand; -} CHKVAL; +} CHKVAL; static bool checkcondition_str(void *checkval, ITEM * val) diff --git a/contrib/test_parser/test_parser.c b/contrib/test_parser/test_parser.c index 784d2d43ad0..a6b24be1e43 100644 --- a/contrib/test_parser/test_parser.c +++ b/contrib/test_parser/test_parser.c @@ -6,7 +6,7 @@ * Copyright (c) 2007, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/test_parser/test_parser.c,v 1.2 2007/11/15 21:14:31 momjian Exp $ + * $PostgreSQL: pgsql/contrib/test_parser/test_parser.c,v 1.3 2007/11/15 22:25:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,7 +35,7 @@ typedef struct int lexid; char *alias; char *descr; -} LexDescr; +} LexDescr; /* * prototypes diff --git a/contrib/uuid-ossp/uuid-ossp.c b/contrib/uuid-ossp/uuid-ossp.c index e1aa8af0943..7002c758c8a 100644 --- a/contrib/uuid-ossp/uuid-ossp.c +++ b/contrib/uuid-ossp/uuid-ossp.c @@ -4,7 +4,7 @@ * * Copyright (c) 2007 PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/contrib/uuid-ossp/uuid-ossp.c,v 1.4 2007/11/15 21:14:31 momjian Exp $ + * $PostgreSQL: pgsql/contrib/uuid-ossp/uuid-ossp.c,v 1.5 2007/11/15 22:25:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -165,7 +165,7 @@ uuid_generate_v1mc(PG_FUNCTION_ARGS) static Datum -uuid_generate_v35_internal(int mode, pg_uuid_t * ns, text *name) +uuid_generate_v35_internal(int mode, pg_uuid_t *ns, text *name) { uuid_t *ns_uuid; Datum result; diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c index 488a58beb5e..389a1077d91 100644 --- a/src/backend/access/gin/ginutil.c +++ b/src/backend/access/gin/ginutil.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginutil.c,v 1.11 2007/11/15 21:14:31 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/gin/ginutil.c,v 1.12 2007/11/15 22:25:14 momjian Exp $ *------------------------------------------------------------------------- */ @@ -133,10 +133,10 @@ typedef struct { FmgrInfo *cmpDatumFunc; bool *needUnique; -} cmpEntriesData; +} cmpEntriesData; static int -cmpEntries(const Datum *a, const Datum *b, cmpEntriesData * arg) +cmpEntries(const Datum *a, const Datum *b, cmpEntriesData *arg) { int res = DatumGetInt32(FunctionCall2(arg->cmpDatumFunc, *a, *b)); diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index 067b23f24cc..516eec3149b 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/pruneheap.c,v 1.4 2007/11/15 21:14:32 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/heap/pruneheap.c,v 1.5 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,11 +75,11 @@ heap_page_prune_opt(Relation relation, Buffer buffer, TransactionId OldestXmin) * fill-factor target (but not less than 10%). * * Checking free space here is questionable since we aren't holding any - * lock on the buffer; in the worst case we could get a bogus answer. - * It's unlikely to be *seriously* wrong, though, since reading either - * pd_lower or pd_upper is probably atomic. Avoiding taking a lock seems - * better than sometimes getting a wrong answer in what is after all just - * a heuristic estimate. + * lock on the buffer; in the worst case we could get a bogus answer. It's + * unlikely to be *seriously* wrong, though, since reading either pd_lower + * or pd_upper is probably atomic. Avoiding taking a lock seems better + * than sometimes getting a wrong answer in what is after all just a + * heuristic estimate. */ minfree = RelationGetTargetPageFreeSpace(relation, HEAP_DEFAULT_FILLFACTOR); diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c index 20c5938ff27..a9088ac9288 100644 --- a/src/backend/access/heap/rewriteheap.c +++ b/src/backend/access/heap/rewriteheap.c @@ -96,7 +96,7 @@ * Portions Copyright (c) 1994-5, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/rewriteheap.c,v 1.8 2007/11/15 21:14:32 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/heap/rewriteheap.c,v 1.9 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -129,7 +129,7 @@ typedef struct RewriteStateData * them */ HTAB *rs_unresolved_tups; /* unmatched A tuples */ HTAB *rs_old_new_tid_map; /* unmatched B tuples */ -} RewriteStateData; +} RewriteStateData; /* * The lookup keys for the hash tables are tuple TID and xmin (we must check @@ -141,7 +141,7 @@ typedef struct { TransactionId xmin; /* tuple xmin */ ItemPointerData tid; /* tuple location in old heap */ -} TidHashKey; +} TidHashKey; /* * Entry structures for the hash tables @@ -151,7 +151,7 @@ typedef struct TidHashKey key; /* expected xmin/old location of B tuple */ ItemPointerData old_tid; /* A's location in the old heap */ HeapTuple tuple; /* A's tuple contents */ -} UnresolvedTupData; +} UnresolvedTupData; typedef UnresolvedTupData *UnresolvedTup; @@ -159,7 +159,7 @@ typedef struct { TidHashKey key; /* actual xmin/old location of B tuple */ ItemPointerData new_tid; /* where we put it in the new heap */ -} OldToNewMappingData; +} OldToNewMappingData; typedef OldToNewMappingData *OldToNewMapping; @@ -425,8 +425,8 @@ rewrite_heap_tuple(RewriteState state, * If the tuple is the updated version of a row, and the prior version * wouldn't be DEAD yet, then we need to either resolve the prior * version (if it's waiting in rs_unresolved_tups), or make an entry - * in rs_old_new_tid_map (so we can resolve it when we do see it). - * The previous tuple's xmax would equal this one's xmin, so it's + * in rs_old_new_tid_map (so we can resolve it when we do see it). The + * previous tuple's xmax would equal this one's xmin, so it's * RECENTLY_DEAD if and only if the xmin is not before OldestXmin. */ if ((new_tuple->t_data->t_infomask & HEAP_UPDATED) && diff --git a/src/backend/access/heap/syncscan.c b/src/backend/access/heap/syncscan.c index 7b0653c9baa..371fff9aef0 100644 --- a/src/backend/access/heap/syncscan.c +++ b/src/backend/access/heap/syncscan.c @@ -40,7 +40,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/syncscan.c,v 1.2 2007/11/15 21:14:32 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/heap/syncscan.c,v 1.3 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -89,21 +89,21 @@ typedef struct ss_scan_location_t { RelFileNode relfilenode; /* identity of a relation */ BlockNumber location; /* last-reported location in the relation */ -} ss_scan_location_t; +} ss_scan_location_t; typedef struct ss_lru_item_t { struct ss_lru_item_t *prev; struct ss_lru_item_t *next; ss_scan_location_t location; -} ss_lru_item_t; +} ss_lru_item_t; typedef struct ss_scan_locations_t { ss_lru_item_t *head; ss_lru_item_t *tail; ss_lru_item_t items[1]; /* SYNC_SCAN_NELEM items */ -} ss_scan_locations_t; +} ss_scan_locations_t; #define SizeOfScanLocations(N) offsetof(ss_scan_locations_t, items[N]) diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c index 79aae66201f..cdea9c16525 100644 --- a/src/backend/access/nbtree/nbtxlog.c +++ b/src/backend/access/nbtree/nbtxlog.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.47 2007/11/15 21:14:32 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.48 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,7 +40,7 @@ typedef struct bt_incomplete_action BlockNumber rightblk; /* right half of split */ /* these fields are for a delete: */ BlockNumber delblk; /* parent block to be deleted */ -} bt_incomplete_action; +} bt_incomplete_action; static List *incomplete_actions; diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 30539dea18f..501e4478876 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.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/access/transam/xlog.c,v 1.289 2007/11/15 22:02:12 petere Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.290 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1345,8 +1345,8 @@ static bool XLogCheckpointNeeded(void) { /* - * A straight computation of segment number could overflow 32 bits. - * Rather than assuming we have working 64-bit arithmetic, we compare the + * A straight computation of segment number could overflow 32 bits. Rather + * than assuming we have working 64-bit arithmetic, we compare the * highest-order bits separately, and force a checkpoint immediately when * they change. */ diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index 4e2bb1de5af..6138976268e 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -13,7 +13,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.100 2007/11/15 21:14:33 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.101 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -147,7 +147,7 @@ typedef struct List *searchPath; /* the desired search path */ Oid creationNamespace; /* the desired creation namespace */ int nestLevel; /* subtransaction nesting level */ -} OverrideStackEntry; +} OverrideStackEntry; static List *overrideStack = NIL; @@ -2266,7 +2266,7 @@ GetOverrideSearchPath(MemoryContext context) * search_path variable is ignored while an override is active. */ void -PushOverrideSearchPath(OverrideSearchPath * newpath) +PushOverrideSearchPath(OverrideSearchPath *newpath) { OverrideStackEntry *entry; List *oidlist; diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 20ece6d6eb0..7ce39c0143d 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.111 2007/11/15 21:14:33 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.112 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1346,7 +1346,7 @@ typedef struct FmgrInfo *cmpFn; int cmpFlags; int *tupnoLink; -} CompareScalarsContext; +} CompareScalarsContext; static void compute_minimal_stats(VacAttrStatsP stats, diff --git a/src/backend/commands/discard.c b/src/backend/commands/discard.c index 7af6ce0122f..09aa87b8e4e 100644 --- a/src/backend/commands/discard.c +++ b/src/backend/commands/discard.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/discard.c,v 1.2 2007/11/15 21:14:33 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/discard.c,v 1.3 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,7 @@ static void DiscardAll(bool isTopLevel); * DISCARD { ALL | TEMP | PLANS } */ void -DiscardCommand(DiscardStmt * stmt, bool isTopLevel) +DiscardCommand(DiscardStmt *stmt, bool isTopLevel) { switch (stmt->target) { diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index c385d952d26..a9aa2cb3e13 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994-5, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.166 2007/11/15 21:14:33 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.167 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -216,7 +216,7 @@ ExplainOneUtility(Node *utilityStmt, ExplainStmt *stmt, * to call it. */ void -ExplainOnePlan(PlannedStmt * plannedstmt, ParamListInfo params, +ExplainOnePlan(PlannedStmt *plannedstmt, ParamListInfo params, ExplainStmt *stmt, TupOutputState *tstate) { QueryDesc *queryDesc; diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index 05b94d6283a..08401cd70ec 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.56 2007/11/15 21:14:33 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.57 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -52,7 +52,7 @@ typedef struct Oid lefttype; /* lefttype */ Oid righttype; /* righttype */ bool recheck; /* oper recheck flag (unused for proc) */ -} OpFamilyMember; +} OpFamilyMember; static void AlterOpFamilyAdd(List *opfamilyname, Oid amoid, Oid opfamilyoid, @@ -62,9 +62,9 @@ static void AlterOpFamilyDrop(List *opfamilyname, Oid amoid, Oid opfamilyoid, int maxOpNumber, int maxProcNumber, List *items); static void processTypesSpec(List *args, Oid *lefttype, Oid *righttype); -static void assignOperTypes(OpFamilyMember * member, Oid amoid, Oid typeoid); -static void assignProcTypes(OpFamilyMember * member, Oid amoid, Oid typeoid); -static void addFamilyMember(List **list, OpFamilyMember * member, bool isProc); +static void assignOperTypes(OpFamilyMember *member, Oid amoid, Oid typeoid); +static void assignProcTypes(OpFamilyMember *member, Oid amoid, Oid typeoid); +static void addFamilyMember(List **list, OpFamilyMember *member, bool isProc); static void storeOperators(List *opfamilyname, Oid amoid, Oid opfamilyoid, Oid opclassoid, List *operators, bool isAdd); @@ -646,7 +646,7 @@ DefineOpClass(CreateOpClassStmt *stmt) * Define a new index operator family. */ void -DefineOpFamily(CreateOpFamilyStmt * stmt) +DefineOpFamily(CreateOpFamilyStmt *stmt) { char *opfname; /* name of opfamily we're creating */ Oid amoid, /* our AM's oid */ @@ -765,7 +765,7 @@ DefineOpFamily(CreateOpFamilyStmt * stmt) * different code paths. */ void -AlterOpFamily(AlterOpFamilyStmt * stmt) +AlterOpFamily(AlterOpFamilyStmt *stmt) { Oid amoid, /* our AM's oid */ opfamilyoid; /* oid of opfamily */ @@ -1059,7 +1059,7 @@ processTypesSpec(List *args, Oid *lefttype, Oid *righttype) * and do any validity checking we can manage. */ static void -assignOperTypes(OpFamilyMember * member, Oid amoid, Oid typeoid) +assignOperTypes(OpFamilyMember *member, Oid amoid, Oid typeoid) { Operator optup; Form_pg_operator opform; @@ -1100,7 +1100,7 @@ assignOperTypes(OpFamilyMember * member, Oid amoid, Oid typeoid) * and do any validity checking we can manage. */ static void -assignProcTypes(OpFamilyMember * member, Oid amoid, Oid typeoid) +assignProcTypes(OpFamilyMember *member, Oid amoid, Oid typeoid) { HeapTuple proctup; Form_pg_proc procform; @@ -1181,7 +1181,7 @@ assignProcTypes(OpFamilyMember * member, Oid amoid, Oid typeoid) * duplicated strategy or proc number. */ static void -addFamilyMember(List **list, OpFamilyMember * member, bool isProc) +addFamilyMember(List **list, OpFamilyMember *member, bool isProc) { ListCell *l; @@ -1562,7 +1562,7 @@ RemoveOpClass(RemoveOpClassStmt *stmt) * Deletes an opfamily. */ void -RemoveOpFamily(RemoveOpFamilyStmt * stmt) +RemoveOpFamily(RemoveOpFamilyStmt *stmt) { Oid amID, opfID; diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c index ba9e9a2320f..d501d30735a 100644 --- a/src/backend/commands/portalcmds.c +++ b/src/backend/commands/portalcmds.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.67 2007/11/15 21:14:33 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.68 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,7 +39,7 @@ * utilityStmt field is set. */ void -PerformCursorOpen(PlannedStmt * stmt, ParamListInfo params, +PerformCursorOpen(PlannedStmt *stmt, ParamListInfo params, const char *queryString, bool isTopLevel) { DeclareCursorStmt *cstmt = (DeclareCursorStmt *) stmt->utilityStmt; diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c index 608293cac3b..30116cd01d6 100644 --- a/src/backend/commands/tsearchcmds.c +++ b/src/backend/commands/tsearchcmds.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tsearchcmds.c,v 1.6 2007/11/15 21:14:34 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tsearchcmds.c,v 1.7 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,9 +46,9 @@ #include "utils/syscache.h" -static void MakeConfigurationMapping(AlterTSConfigurationStmt * stmt, +static void MakeConfigurationMapping(AlterTSConfigurationStmt *stmt, HeapTuple tup, Relation relMap); -static void DropConfigurationMapping(AlterTSConfigurationStmt * stmt, +static void DropConfigurationMapping(AlterTSConfigurationStmt *stmt, HeapTuple tup, Relation relMap); @@ -691,7 +691,7 @@ RemoveTSDictionaryById(Oid dictId) * ALTER TEXT SEARCH DICTIONARY */ void -AlterTSDictionary(AlterTSDictionaryStmt * stmt) +AlterTSDictionary(AlterTSDictionaryStmt *stmt) { HeapTuple tup, newtup; @@ -1632,7 +1632,7 @@ AlterTSConfigurationOwner(List *name, Oid newOwnerId) * ALTER TEXT SEARCH CONFIGURATION - main entry point */ void -AlterTSConfiguration(AlterTSConfigurationStmt * stmt) +AlterTSConfiguration(AlterTSConfigurationStmt *stmt) { HeapTuple tup; Relation relMap; @@ -1726,7 +1726,7 @@ getTokenTypes(Oid prsId, List *tokennames) * ALTER TEXT SEARCH CONFIGURATION ADD/ALTER MAPPING */ static void -MakeConfigurationMapping(AlterTSConfigurationStmt * stmt, +MakeConfigurationMapping(AlterTSConfigurationStmt *stmt, HeapTuple tup, Relation relMap) { Oid cfgId = HeapTupleGetOid(tup); @@ -1888,7 +1888,7 @@ MakeConfigurationMapping(AlterTSConfigurationStmt * stmt, * ALTER TEXT SEARCH CONFIGURATION DROP MAPPING */ static void -DropConfigurationMapping(AlterTSConfigurationStmt * stmt, +DropConfigurationMapping(AlterTSConfigurationStmt *stmt, HeapTuple tup, Relation relMap) { Oid cfgId = HeapTupleGetOid(tup); @@ -2031,7 +2031,7 @@ deserialize_deflist(Datum txt) CS_INSQVALUE, CS_INDQVALUE, CS_INWVALUE - } ds_state; + } ds_state; ds_state state = CS_WAITKEY; workspace = (char *) palloc(len + 1); /* certainly enough room */ diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c index e93f3b9a4f5..8d187d20267 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.111 2007/11/15 21:14:34 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.112 2007/11/15 22:25:15 momjian Exp $ * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the @@ -995,7 +995,7 @@ RemoveDomain(List *names, DropBehavior behavior, bool missing_ok) * Registers a new enum. */ void -DefineEnum(CreateEnumStmt * stmt) +DefineEnum(CreateEnumStmt *stmt) { char *enumName; char *enumArrayName; diff --git a/src/backend/executor/execCurrent.c b/src/backend/executor/execCurrent.c index 9f63d99d659..54d073891bc 100644 --- a/src/backend/executor/execCurrent.c +++ b/src/backend/executor/execCurrent.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/executor/execCurrent.c,v 1.3 2007/11/15 21:14:34 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execCurrent.c,v 1.4 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,7 +36,7 @@ static ScanState *search_plan_tree(PlanState *node, Oid table_oid); * valid updatable scan of the specified table. */ bool -execCurrentOf(CurrentOfExpr * cexpr, +execCurrentOf(CurrentOfExpr *cexpr, ExprContext *econtext, Oid table_oid, ItemPointer current_tid) diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 90136981fb5..4b6ad47adb0 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.299 2007/11/15 21:14:34 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.300 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -95,7 +95,7 @@ static TupleTableSlot *EvalPlanQualNext(EState *estate); static void EndEvalPlanQual(EState *estate); static void ExecCheckRTPerms(List *rangeTable); static void ExecCheckRTEPerms(RangeTblEntry *rte); -static void ExecCheckXactReadOnly(PlannedStmt * plannedstmt); +static void ExecCheckXactReadOnly(PlannedStmt *plannedstmt); static void EvalPlanQualStart(evalPlanQual *epq, EState *estate, evalPlanQual *priorepq); static void EvalPlanQualStop(evalPlanQual *epq); @@ -411,7 +411,7 @@ ExecCheckRTEPerms(RangeTblEntry *rte) * Check that the query does not imply any writes to non-temp tables. */ static void -ExecCheckXactReadOnly(PlannedStmt * plannedstmt) +ExecCheckXactReadOnly(PlannedStmt *plannedstmt) { ListCell *l; diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index 8c917c84189..84581fead76 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.224 2007/11/15 21:14:34 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.225 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -121,7 +121,7 @@ static Datum ExecEvalCoalesce(CoalesceExprState *coalesceExpr, static Datum ExecEvalMinMax(MinMaxExprState *minmaxExpr, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone); -static Datum ExecEvalXml(XmlExprState * xmlExpr, ExprContext *econtext, +static Datum ExecEvalXml(XmlExprState *xmlExpr, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone); static Datum ExecEvalNullIf(FuncExprState *nullIfExpr, ExprContext *econtext, @@ -147,10 +147,10 @@ static Datum ExecEvalFieldStore(FieldStoreState *fstate, static Datum ExecEvalRelabelType(GenericExprState *exprstate, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone); -static Datum ExecEvalCoerceViaIO(CoerceViaIOState * iostate, +static Datum ExecEvalCoerceViaIO(CoerceViaIOState *iostate, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone); -static Datum ExecEvalArrayCoerceExpr(ArrayCoerceExprState * astate, +static Datum ExecEvalArrayCoerceExpr(ArrayCoerceExprState *astate, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone); static Datum ExecEvalCurrentOfExpr(ExprState *exprstate, ExprContext *econtext, @@ -2844,7 +2844,7 @@ ExecEvalMinMax(MinMaxExprState *minmaxExpr, ExprContext *econtext, * ---------------------------------------------------------------- */ static Datum -ExecEvalXml(XmlExprState * xmlExpr, ExprContext *econtext, +ExecEvalXml(XmlExprState *xmlExpr, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone) { XmlExpr *xexpr = (XmlExpr *) xmlExpr->xprstate.expr; @@ -3587,7 +3587,7 @@ ExecEvalRelabelType(GenericExprState *exprstate, * ---------------------------------------------------------------- */ static Datum -ExecEvalCoerceViaIO(CoerceViaIOState * iostate, +ExecEvalCoerceViaIO(CoerceViaIOState *iostate, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone) { @@ -3621,7 +3621,7 @@ ExecEvalCoerceViaIO(CoerceViaIOState * iostate, * ---------------------------------------------------------------- */ static Datum -ExecEvalArrayCoerceExpr(ArrayCoerceExprState * astate, +ExecEvalArrayCoerceExpr(ArrayCoerceExprState *astate, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone) { diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index d3396a8d0f0..17de2ff3b88 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -15,7 +15,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.384 2007/11/15 21:14:35 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.385 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,7 +68,7 @@ * _copyPlannedStmt */ static PlannedStmt * -_copyPlannedStmt(PlannedStmt * from) +_copyPlannedStmt(PlannedStmt *from) { PlannedStmt *newnode = makeNode(PlannedStmt); @@ -727,7 +727,7 @@ _copyRangeVar(RangeVar *from) * _copyIntoClause */ static IntoClause * -_copyIntoClause(IntoClause * from) +_copyIntoClause(IntoClause *from) { IntoClause *newnode = makeNode(IntoClause); @@ -1026,7 +1026,7 @@ _copyRelabelType(RelabelType *from) * _copyCoerceViaIO */ static CoerceViaIO * -_copyCoerceViaIO(CoerceViaIO * from) +_copyCoerceViaIO(CoerceViaIO *from) { CoerceViaIO *newnode = makeNode(CoerceViaIO); @@ -1041,7 +1041,7 @@ _copyCoerceViaIO(CoerceViaIO * from) * _copyArrayCoerceExpr */ static ArrayCoerceExpr * -_copyArrayCoerceExpr(ArrayCoerceExpr * from) +_copyArrayCoerceExpr(ArrayCoerceExpr *from) { ArrayCoerceExpr *newnode = makeNode(ArrayCoerceExpr); @@ -1195,7 +1195,7 @@ _copyMinMaxExpr(MinMaxExpr *from) * _copyXmlExpr */ static XmlExpr * -_copyXmlExpr(XmlExpr * from) +_copyXmlExpr(XmlExpr *from) { XmlExpr *newnode = makeNode(XmlExpr); @@ -1304,7 +1304,7 @@ _copySetToDefault(SetToDefault *from) * _copyCurrentOfExpr */ static CurrentOfExpr * -_copyCurrentOfExpr(CurrentOfExpr * from) +_copyCurrentOfExpr(CurrentOfExpr *from) { CurrentOfExpr *newnode = makeNode(CurrentOfExpr); @@ -1393,7 +1393,7 @@ _copyFromExpr(FromExpr *from) * _copyPathKey */ static PathKey * -_copyPathKey(PathKey * from) +_copyPathKey(PathKey *from) { PathKey *newnode = makeNode(PathKey); @@ -1833,7 +1833,7 @@ _copyLockingClause(LockingClause *from) } static XmlSerialize * -_copyXmlSerialize(XmlSerialize * from) +_copyXmlSerialize(XmlSerialize *from) { XmlSerialize *newnode = makeNode(XmlSerialize); @@ -2271,7 +2271,7 @@ _copyRemoveOpClassStmt(RemoveOpClassStmt *from) } static RemoveOpFamilyStmt * -_copyRemoveOpFamilyStmt(RemoveOpFamilyStmt * from) +_copyRemoveOpFamilyStmt(RemoveOpFamilyStmt *from) { RemoveOpFamilyStmt *newnode = makeNode(RemoveOpFamilyStmt); @@ -2398,7 +2398,7 @@ _copyCompositeTypeStmt(CompositeTypeStmt *from) } static CreateEnumStmt * -_copyCreateEnumStmt(CreateEnumStmt * from) +_copyCreateEnumStmt(CreateEnumStmt *from) { CreateEnumStmt *newnode = makeNode(CreateEnumStmt); @@ -2475,7 +2475,7 @@ _copyCreateOpClassItem(CreateOpClassItem *from) } static CreateOpFamilyStmt * -_copyCreateOpFamilyStmt(CreateOpFamilyStmt * from) +_copyCreateOpFamilyStmt(CreateOpFamilyStmt *from) { CreateOpFamilyStmt *newnode = makeNode(CreateOpFamilyStmt); @@ -2486,7 +2486,7 @@ _copyCreateOpFamilyStmt(CreateOpFamilyStmt * from) } static AlterOpFamilyStmt * -_copyAlterOpFamilyStmt(AlterOpFamilyStmt * from) +_copyAlterOpFamilyStmt(AlterOpFamilyStmt *from) { AlterOpFamilyStmt *newnode = makeNode(AlterOpFamilyStmt); @@ -2616,7 +2616,7 @@ _copyVariableShowStmt(VariableShowStmt *from) } static DiscardStmt * -_copyDiscardStmt(DiscardStmt * from) +_copyDiscardStmt(DiscardStmt *from) { DiscardStmt *newnode = makeNode(DiscardStmt); diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index 0a832113b00..11543623719 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -18,7 +18,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.314 2007/11/15 21:14:35 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.315 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -103,7 +103,7 @@ _equalRangeVar(RangeVar *a, RangeVar *b) } static bool -_equalIntoClause(IntoClause * a, IntoClause * b) +_equalIntoClause(IntoClause *a, IntoClause *b) { COMPARE_NODE_FIELD(rel); COMPARE_NODE_FIELD(colNames); @@ -360,7 +360,7 @@ _equalRelabelType(RelabelType *a, RelabelType *b) } static bool -_equalCoerceViaIO(CoerceViaIO * a, CoerceViaIO * b) +_equalCoerceViaIO(CoerceViaIO *a, CoerceViaIO *b) { COMPARE_NODE_FIELD(arg); COMPARE_SCALAR_FIELD(resulttype); @@ -378,7 +378,7 @@ _equalCoerceViaIO(CoerceViaIO * a, CoerceViaIO * b) } static bool -_equalArrayCoerceExpr(ArrayCoerceExpr * a, ArrayCoerceExpr * b) +_equalArrayCoerceExpr(ArrayCoerceExpr *a, ArrayCoerceExpr *b) { COMPARE_NODE_FIELD(arg); COMPARE_SCALAR_FIELD(elemfuncid); @@ -506,7 +506,7 @@ _equalMinMaxExpr(MinMaxExpr *a, MinMaxExpr *b) } static bool -_equalXmlExpr(XmlExpr * a, XmlExpr * b) +_equalXmlExpr(XmlExpr *a, XmlExpr *b) { COMPARE_SCALAR_FIELD(op); COMPARE_STRING_FIELD(name); @@ -599,7 +599,7 @@ _equalSetToDefault(SetToDefault *a, SetToDefault *b) } static bool -_equalCurrentOfExpr(CurrentOfExpr * a, CurrentOfExpr * b) +_equalCurrentOfExpr(CurrentOfExpr *a, CurrentOfExpr *b) { COMPARE_SCALAR_FIELD(cvarno); COMPARE_STRING_FIELD(cursor_name); @@ -660,7 +660,7 @@ _equalFromExpr(FromExpr *a, FromExpr *b) */ static bool -_equalPathKey(PathKey * a, PathKey * b) +_equalPathKey(PathKey *a, PathKey *b) { /* * This is normally used on non-canonicalized PathKeys, so must chase up @@ -1112,7 +1112,7 @@ _equalRemoveOpClassStmt(RemoveOpClassStmt *a, RemoveOpClassStmt *b) } static bool -_equalRemoveOpFamilyStmt(RemoveOpFamilyStmt * a, RemoveOpFamilyStmt * b) +_equalRemoveOpFamilyStmt(RemoveOpFamilyStmt *a, RemoveOpFamilyStmt *b) { COMPARE_NODE_FIELD(opfamilyname); COMPARE_STRING_FIELD(amname); @@ -1219,7 +1219,7 @@ _equalCompositeTypeStmt(CompositeTypeStmt *a, CompositeTypeStmt *b) } static bool -_equalCreateEnumStmt(CreateEnumStmt * a, CreateEnumStmt * b) +_equalCreateEnumStmt(CreateEnumStmt *a, CreateEnumStmt *b) { COMPARE_NODE_FIELD(typename); COMPARE_NODE_FIELD(vals); @@ -1284,7 +1284,7 @@ _equalCreateOpClassItem(CreateOpClassItem *a, CreateOpClassItem *b) } static bool -_equalCreateOpFamilyStmt(CreateOpFamilyStmt * a, CreateOpFamilyStmt * b) +_equalCreateOpFamilyStmt(CreateOpFamilyStmt *a, CreateOpFamilyStmt *b) { COMPARE_NODE_FIELD(opfamilyname); COMPARE_STRING_FIELD(amname); @@ -1293,7 +1293,7 @@ _equalCreateOpFamilyStmt(CreateOpFamilyStmt * a, CreateOpFamilyStmt * b) } static bool -_equalAlterOpFamilyStmt(AlterOpFamilyStmt * a, AlterOpFamilyStmt * b) +_equalAlterOpFamilyStmt(AlterOpFamilyStmt *a, AlterOpFamilyStmt *b) { COMPARE_NODE_FIELD(opfamilyname); COMPARE_STRING_FIELD(amname); @@ -1401,7 +1401,7 @@ _equalVariableShowStmt(VariableShowStmt *a, VariableShowStmt *b) } static bool -_equalDiscardStmt(DiscardStmt * a, DiscardStmt * b) +_equalDiscardStmt(DiscardStmt *a, DiscardStmt *b) { COMPARE_SCALAR_FIELD(target); @@ -1893,7 +1893,7 @@ _equalFkConstraint(FkConstraint *a, FkConstraint *b) } static bool -_equalXmlSerialize(XmlSerialize * a, XmlSerialize * b) +_equalXmlSerialize(XmlSerialize *a, XmlSerialize *b) { COMPARE_SCALAR_FIELD(xmloption); COMPARE_NODE_FIELD(expr); diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index d97e56e4e4a..7d3952c86bd 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.317 2007/11/15 21:14:35 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.318 2007/11/15 22:25:15 momjian Exp $ * * NOTES * Every node type that can appear in stored rules' parsetrees *must* @@ -235,7 +235,7 @@ _outDatum(StringInfo str, Datum value, int typlen, bool typbyval) */ static void -_outPlannedStmt(StringInfo str, PlannedStmt * node) +_outPlannedStmt(StringInfo str, PlannedStmt *node) { WRITE_NODE_TYPE("PLANNEDSTMT"); @@ -656,7 +656,7 @@ _outRangeVar(StringInfo str, RangeVar *node) } static void -_outIntoClause(StringInfo str, IntoClause * node) +_outIntoClause(StringInfo str, IntoClause *node) { WRITE_NODE_TYPE("INTOCLAUSE"); @@ -872,7 +872,7 @@ _outRelabelType(StringInfo str, RelabelType *node) } static void -_outCoerceViaIO(StringInfo str, CoerceViaIO * node) +_outCoerceViaIO(StringInfo str, CoerceViaIO *node) { WRITE_NODE_TYPE("COERCEVIAIO"); @@ -882,7 +882,7 @@ _outCoerceViaIO(StringInfo str, CoerceViaIO * node) } static void -_outArrayCoerceExpr(StringInfo str, ArrayCoerceExpr * node) +_outArrayCoerceExpr(StringInfo str, ArrayCoerceExpr *node) { WRITE_NODE_TYPE("ARRAYCOERCEEXPR"); @@ -986,7 +986,7 @@ _outMinMaxExpr(StringInfo str, MinMaxExpr *node) } static void -_outXmlExpr(StringInfo str, XmlExpr * node) +_outXmlExpr(StringInfo str, XmlExpr *node) { WRITE_NODE_TYPE("XMLEXPR"); @@ -1060,7 +1060,7 @@ _outSetToDefault(StringInfo str, SetToDefault *node) } static void -_outCurrentOfExpr(StringInfo str, CurrentOfExpr * node) +_outCurrentOfExpr(StringInfo str, CurrentOfExpr *node) { WRITE_NODE_TYPE("CURRENTOFEXPR"); @@ -1291,7 +1291,7 @@ _outHashPath(StringInfo str, HashPath *node) } static void -_outPlannerGlobal(StringInfo str, PlannerGlobal * node) +_outPlannerGlobal(StringInfo str, PlannerGlobal *node) { WRITE_NODE_TYPE("PLANNERGLOBAL"); @@ -1385,7 +1385,7 @@ _outIndexOptInfo(StringInfo str, IndexOptInfo *node) } static void -_outEquivalenceClass(StringInfo str, EquivalenceClass * node) +_outEquivalenceClass(StringInfo str, EquivalenceClass *node) { /* * To simplify reading, we just chase up to the topmost merged EC and @@ -1409,7 +1409,7 @@ _outEquivalenceClass(StringInfo str, EquivalenceClass * node) } static void -_outEquivalenceMember(StringInfo str, EquivalenceMember * node) +_outEquivalenceMember(StringInfo str, EquivalenceMember *node) { WRITE_NODE_TYPE("EQUIVALENCEMEMBER"); @@ -1421,7 +1421,7 @@ _outEquivalenceMember(StringInfo str, EquivalenceMember * node) } static void -_outPathKey(StringInfo str, PathKey * node) +_outPathKey(StringInfo str, PathKey *node) { WRITE_NODE_TYPE("PATHKEY"); @@ -1627,7 +1627,7 @@ _outLockingClause(StringInfo str, LockingClause *node) } static void -_outXmlSerialize(StringInfo str, XmlSerialize * node) +_outXmlSerialize(StringInfo str, XmlSerialize *node) { WRITE_NODE_TYPE("XMLSERIALIZE"); diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index 52f6e14bdac..fc95399b396 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -54,7 +54,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/costsize.c,v 1.188 2007/11/15 21:14:35 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/path/costsize.c,v 1.189 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -112,12 +112,12 @@ typedef struct { PlannerInfo *root; QualCost total; -} cost_qual_eval_context; +} cost_qual_eval_context; static MergeScanSelCache *cached_scansel(PlannerInfo *root, RestrictInfo *rinfo, - PathKey * pathkey); -static bool cost_qual_eval_walker(Node *node, cost_qual_eval_context * context); + PathKey *pathkey); +static bool cost_qual_eval_walker(Node *node, cost_qual_eval_context *context); static Selectivity approx_selectivity(PlannerInfo *root, List *quals, JoinType jointype); static Selectivity join_in_selectivity(JoinPath *path, PlannerInfo *root); @@ -1593,7 +1593,7 @@ cost_mergejoin(MergePath *path, PlannerInfo *root) * run mergejoinscansel() with caching */ static MergeScanSelCache * -cached_scansel(PlannerInfo *root, RestrictInfo *rinfo, PathKey * pathkey) +cached_scansel(PlannerInfo *root, RestrictInfo *rinfo, PathKey *pathkey) { MergeScanSelCache *cache; ListCell *lc; @@ -1891,7 +1891,7 @@ cost_qual_eval_node(QualCost *cost, Node *qual, PlannerInfo *root) } static bool -cost_qual_eval_walker(Node *node, cost_qual_eval_context * context) +cost_qual_eval_walker(Node *node, cost_qual_eval_context *context) { if (node == NULL) return false; diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c index 67204728a53..5d92c7c8df2 100644 --- a/src/backend/optimizer/path/equivclass.c +++ b/src/backend/optimizer/path/equivclass.c @@ -10,7 +10,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/equivclass.c,v 1.5 2007/11/15 21:14:35 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/path/equivclass.c,v 1.6 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,32 +26,32 @@ #include "utils/lsyscache.h" -static EquivalenceMember *add_eq_member(EquivalenceClass * ec, +static EquivalenceMember *add_eq_member(EquivalenceClass *ec, Expr *expr, Relids relids, bool is_child, Oid datatype); static void generate_base_implied_equalities_const(PlannerInfo *root, - EquivalenceClass * ec); + EquivalenceClass *ec); static void generate_base_implied_equalities_no_const(PlannerInfo *root, - EquivalenceClass * ec); + EquivalenceClass *ec); static void generate_base_implied_equalities_broken(PlannerInfo *root, - EquivalenceClass * ec); + EquivalenceClass *ec); static List *generate_join_implied_equalities_normal(PlannerInfo *root, - EquivalenceClass * ec, + EquivalenceClass *ec, RelOptInfo *joinrel, RelOptInfo *outer_rel, RelOptInfo *inner_rel); static List *generate_join_implied_equalities_broken(PlannerInfo *root, - EquivalenceClass * ec, + EquivalenceClass *ec, RelOptInfo *joinrel, RelOptInfo *outer_rel, RelOptInfo *inner_rel); -static Oid select_equality_operator(EquivalenceClass * ec, +static Oid select_equality_operator(EquivalenceClass *ec, Oid lefttype, Oid righttype); static RestrictInfo *create_join_clause(PlannerInfo *root, - EquivalenceClass * ec, Oid opno, - EquivalenceMember * leftem, - EquivalenceMember * rightem, - EquivalenceClass * parent_ec); + EquivalenceClass *ec, Oid opno, + EquivalenceMember *leftem, + EquivalenceMember *rightem, + EquivalenceClass *parent_ec); static void reconsider_outer_join_clause(PlannerInfo *root, RestrictInfo *rinfo, bool outer_on_left); @@ -313,7 +313,7 @@ process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo, * add_eq_member - build a new EquivalenceMember and add it to an EC */ static EquivalenceMember * -add_eq_member(EquivalenceClass * ec, Expr *expr, Relids relids, +add_eq_member(EquivalenceClass *ec, Expr *expr, Relids relids, bool is_child, Oid datatype) { EquivalenceMember *em = makeNode(EquivalenceMember); @@ -554,7 +554,7 @@ generate_base_implied_equalities(PlannerInfo *root) */ static void generate_base_implied_equalities_const(PlannerInfo *root, - EquivalenceClass * ec) + EquivalenceClass *ec) { EquivalenceMember *const_em = NULL; ListCell *lc; @@ -603,7 +603,7 @@ generate_base_implied_equalities_const(PlannerInfo *root, */ static void generate_base_implied_equalities_no_const(PlannerInfo *root, - EquivalenceClass * ec) + EquivalenceClass *ec) { EquivalenceMember **prev_ems; ListCell *lc; @@ -685,7 +685,7 @@ generate_base_implied_equalities_no_const(PlannerInfo *root, */ static void generate_base_implied_equalities_broken(PlannerInfo *root, - EquivalenceClass * ec) + EquivalenceClass *ec) { ListCell *lc; @@ -775,7 +775,7 @@ generate_join_implied_equalities(PlannerInfo *root, */ static List * generate_join_implied_equalities_normal(PlannerInfo *root, - EquivalenceClass * ec, + EquivalenceClass *ec, RelOptInfo *joinrel, RelOptInfo *outer_rel, RelOptInfo *inner_rel) @@ -944,7 +944,7 @@ generate_join_implied_equalities_normal(PlannerInfo *root, */ static List * generate_join_implied_equalities_broken(PlannerInfo *root, - EquivalenceClass * ec, + EquivalenceClass *ec, RelOptInfo *joinrel, RelOptInfo *outer_rel, RelOptInfo *inner_rel) @@ -973,7 +973,7 @@ generate_join_implied_equalities_broken(PlannerInfo *root, * Returns InvalidOid if no operator can be found for this datatype combination */ static Oid -select_equality_operator(EquivalenceClass * ec, Oid lefttype, Oid righttype) +select_equality_operator(EquivalenceClass *ec, Oid lefttype, Oid righttype) { ListCell *lc; @@ -1003,10 +1003,10 @@ select_equality_operator(EquivalenceClass * ec, Oid lefttype, Oid righttype) */ static RestrictInfo * create_join_clause(PlannerInfo *root, - EquivalenceClass * ec, Oid opno, - EquivalenceMember * leftem, - EquivalenceMember * rightem, - EquivalenceClass * parent_ec) + EquivalenceClass *ec, Oid opno, + EquivalenceMember *leftem, + EquivalenceMember *rightem, + EquivalenceClass *parent_ec) { RestrictInfo *rinfo; ListCell *lc; @@ -1553,8 +1553,8 @@ find_eclass_clauses_for_index_join(PlannerInfo *root, RelOptInfo *rel, /* * Found one, so try to generate a join clause. This is like * generate_join_implied_equalities_normal, except simpler since - * our only preference item is to pick a Var on the outer side. - * We only need one join clause per index col. + * our only preference item is to pick a Var on the outer side. We + * only need one join clause per index col. */ foreach(lc3, cur_ec->ec_members) { @@ -1750,7 +1750,7 @@ has_relevant_eclass_joinclause(PlannerInfo *root, RelOptInfo *rel1) * from actually being generated. */ bool -eclass_useful_for_merging(EquivalenceClass * eclass, +eclass_useful_for_merging(EquivalenceClass *eclass, RelOptInfo *rel) { ListCell *lc; diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index 4bd9392313a..26a1092e165 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/indxpath.c,v 1.224 2007/11/15 21:14:35 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/path/indxpath.c,v 1.225 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -52,7 +52,7 @@ typedef struct List *quals; /* the WHERE clauses it uses */ List *preds; /* predicates of its partial index(es) */ Bitmapset *clauseids; /* quals+preds represented as a bitmapset */ -} PathClauseUsage; +} PathClauseUsage; static List *find_usable_indexes(PlannerInfo *root, RelOptInfo *rel, @@ -774,8 +774,8 @@ choose_bitmap_and(PlannerInfo *root, RelOptInfo *rel, static int path_usage_comparator(const void *a, const void *b) { - PathClauseUsage *pa = *(PathClauseUsage * const *) a; - PathClauseUsage *pb = *(PathClauseUsage * const *) b; + PathClauseUsage *pa = *(PathClauseUsage *const *) a; + PathClauseUsage *pb = *(PathClauseUsage *const *) b; Cost acost; Cost bcost; Selectivity aselec; @@ -1569,7 +1569,7 @@ matches_any_index(RestrictInfo *rinfo, RelOptInfo *rel, Relids outer_relids) * This is also exported for use by find_eclass_clauses_for_index_join. */ bool -eclass_matches_any_index(EquivalenceClass * ec, EquivalenceMember * em, +eclass_matches_any_index(EquivalenceClass *ec, EquivalenceMember *em, RelOptInfo *rel) { ListCell *l; diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c index 7d22194860f..2c818c46cc4 100644 --- a/src/backend/optimizer/path/pathkeys.c +++ b/src/backend/optimizer/path/pathkeys.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/pathkeys.c,v 1.90 2007/11/15 21:14:36 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/path/pathkeys.c,v 1.91 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,12 +37,12 @@ #define MUST_BE_REDUNDANT(eclass) \ ((eclass)->ec_has_const && !(eclass)->ec_below_outer_join) -static PathKey *makePathKey(EquivalenceClass * eclass, Oid opfamily, +static PathKey *makePathKey(EquivalenceClass *eclass, Oid opfamily, int strategy, bool nulls_first); static PathKey *make_canonical_pathkey(PlannerInfo *root, - EquivalenceClass * eclass, Oid opfamily, + EquivalenceClass *eclass, Oid opfamily, int strategy, bool nulls_first); -static bool pathkey_is_redundant(PathKey * new_pathkey, List *pathkeys); +static bool pathkey_is_redundant(PathKey *new_pathkey, List *pathkeys); static PathKey *make_pathkey_from_sortinfo(PlannerInfo *root, Expr *expr, Oid ordering_op, bool nulls_first, @@ -50,7 +50,7 @@ static PathKey *make_pathkey_from_sortinfo(PlannerInfo *root, bool canonicalize); static Var *find_indexkey_var(PlannerInfo *root, RelOptInfo *rel, AttrNumber varattno); -static bool right_merge_direction(PlannerInfo *root, PathKey * pathkey); +static bool right_merge_direction(PlannerInfo *root, PathKey *pathkey); /**************************************************************************** @@ -65,7 +65,7 @@ static bool right_merge_direction(PlannerInfo *root, PathKey * pathkey); * convenience routine to build the specified node. */ static PathKey * -makePathKey(EquivalenceClass * eclass, Oid opfamily, +makePathKey(EquivalenceClass *eclass, Oid opfamily, int strategy, bool nulls_first) { PathKey *pk = makeNode(PathKey); @@ -89,7 +89,7 @@ makePathKey(EquivalenceClass * eclass, Oid opfamily, */ static PathKey * make_canonical_pathkey(PlannerInfo *root, - EquivalenceClass * eclass, Oid opfamily, + EquivalenceClass *eclass, Oid opfamily, int strategy, bool nulls_first) { PathKey *pk; @@ -155,7 +155,7 @@ make_canonical_pathkey(PlannerInfo *root, * pointer comparison is enough to decide whether canonical ECs are the same. */ static bool -pathkey_is_redundant(PathKey * new_pathkey, List *pathkeys) +pathkey_is_redundant(PathKey *new_pathkey, List *pathkeys) { EquivalenceClass *new_ec = new_pathkey->pk_eclass; ListCell *lc; @@ -1392,7 +1392,7 @@ pathkeys_useful_for_merging(PlannerInfo *root, RelOptInfo *rel, List *pathkeys) * for merging its target column. */ static bool -right_merge_direction(PlannerInfo *root, PathKey * pathkey) +right_merge_direction(PlannerInfo *root, PathKey *pathkey) { ListCell *l; diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index eed6446c8a8..13ae3b8cb23 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/createplan.c,v 1.235 2007/11/15 21:14:36 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/plan/createplan.c,v 1.236 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -2141,7 +2141,7 @@ order_qual_clauses(PlannerInfo *root, List *clauses) { Node *clause; Cost cost; - } QualItem; + } QualItem; int nitems = list_length(clauses); QualItem *items; ListCell *lc; diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 5234e0433d2..6abca763ee9 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.224 2007/11/15 21:14:36 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.225 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -229,7 +229,7 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams) *-------------------- */ Plan * -subquery_planner(PlannerGlobal * glob, Query *parse, +subquery_planner(PlannerGlobal *glob, Query *parse, Index level, double tuple_fraction, PlannerInfo **subroot) { diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index af7ab0d7f3d..b3be9b74152 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/setrefs.c,v 1.138 2007/11/15 21:14:36 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/plan/setrefs.c,v 1.139 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,7 +45,7 @@ typedef struct { PlannerGlobal *glob; int rtoffset; -} fix_scan_expr_context; +} fix_scan_expr_context; typedef struct { @@ -54,29 +54,29 @@ typedef struct indexed_tlist *inner_itlist; Index acceptable_rel; int rtoffset; -} fix_join_expr_context; +} fix_join_expr_context; typedef struct { PlannerGlobal *glob; indexed_tlist *subplan_itlist; int rtoffset; -} fix_upper_expr_context; +} fix_upper_expr_context; #define fix_scan_list(glob, lst, rtoffset) \ ((List *) fix_scan_expr(glob, (Node *) (lst), rtoffset)) -static Plan *set_plan_refs(PlannerGlobal * glob, Plan *plan, int rtoffset); -static Plan *set_subqueryscan_references(PlannerGlobal * glob, +static Plan *set_plan_refs(PlannerGlobal *glob, Plan *plan, int rtoffset); +static Plan *set_subqueryscan_references(PlannerGlobal *glob, SubqueryScan *plan, int rtoffset); static bool trivial_subqueryscan(SubqueryScan *plan); -static Node *fix_scan_expr(PlannerGlobal * glob, Node *node, int rtoffset); -static Node *fix_scan_expr_mutator(Node *node, fix_scan_expr_context * context); -static void set_join_references(PlannerGlobal * glob, Join *join, int rtoffset); -static void set_inner_join_references(PlannerGlobal * glob, Plan *inner_plan, +static Node *fix_scan_expr(PlannerGlobal *glob, Node *node, int rtoffset); +static Node *fix_scan_expr_mutator(Node *node, fix_scan_expr_context *context); +static void set_join_references(PlannerGlobal *glob, Join *join, int rtoffset); +static void set_inner_join_references(PlannerGlobal *glob, Plan *inner_plan, indexed_tlist *outer_itlist); -static void set_upper_references(PlannerGlobal * glob, Plan *plan, int rtoffset); +static void set_upper_references(PlannerGlobal *glob, Plan *plan, int rtoffset); static void set_dummy_tlist_references(Plan *plan, int rtoffset); static indexed_tlist *build_tlist_index(List *tlist); static Var *search_indexed_tlist_for_var(Var *var, @@ -86,19 +86,19 @@ static Var *search_indexed_tlist_for_var(Var *var, static Var *search_indexed_tlist_for_non_var(Node *node, indexed_tlist *itlist, Index newvarno); -static List *fix_join_expr(PlannerGlobal * glob, +static List *fix_join_expr(PlannerGlobal *glob, List *clauses, indexed_tlist *outer_itlist, indexed_tlist *inner_itlist, Index acceptable_rel, int rtoffset); static Node *fix_join_expr_mutator(Node *node, - fix_join_expr_context * context); -static Node *fix_upper_expr(PlannerGlobal * glob, + fix_join_expr_context *context); +static Node *fix_upper_expr(PlannerGlobal *glob, Node *node, indexed_tlist *subplan_itlist, int rtoffset); static Node *fix_upper_expr_mutator(Node *node, - fix_upper_expr_context * context); + fix_upper_expr_context *context); static bool fix_opfuncids_walker(Node *node, void *context); @@ -160,7 +160,7 @@ static bool fix_opfuncids_walker(Node *node, void *context); * it's not so safe to assume that for expression tree nodes. */ Plan * -set_plan_references(PlannerGlobal * glob, Plan *plan, List *rtable) +set_plan_references(PlannerGlobal *glob, Plan *plan, List *rtable) { int rtoffset = list_length(glob->finalrtable); ListCell *lc; @@ -215,7 +215,7 @@ set_plan_references(PlannerGlobal * glob, Plan *plan, List *rtable) * set_plan_refs: recurse through the Plan nodes of a single subquery level */ static Plan * -set_plan_refs(PlannerGlobal * glob, Plan *plan, int rtoffset) +set_plan_refs(PlannerGlobal *glob, Plan *plan, int rtoffset) { ListCell *l; @@ -473,7 +473,7 @@ set_plan_refs(PlannerGlobal * glob, Plan *plan, int rtoffset) * to do the normal processing on it. */ static Plan * -set_subqueryscan_references(PlannerGlobal * glob, +set_subqueryscan_references(PlannerGlobal *glob, SubqueryScan *plan, int rtoffset) { @@ -619,7 +619,7 @@ copyVar(Var *var) * and adding OIDs from regclass Const nodes into glob->relationOids. */ static Node * -fix_scan_expr(PlannerGlobal * glob, Node *node, int rtoffset) +fix_scan_expr(PlannerGlobal *glob, Node *node, int rtoffset) { fix_scan_expr_context context; @@ -629,7 +629,7 @@ fix_scan_expr(PlannerGlobal * glob, Node *node, int rtoffset) } static Node * -fix_scan_expr_mutator(Node *node, fix_scan_expr_context * context) +fix_scan_expr_mutator(Node *node, fix_scan_expr_context *context) { if (node == NULL) return NULL; @@ -700,7 +700,7 @@ fix_scan_expr_mutator(Node *node, fix_scan_expr_context * context) * quals of the child indexscan. set_inner_join_references does that. */ static void -set_join_references(PlannerGlobal * glob, Join *join, int rtoffset) +set_join_references(PlannerGlobal *glob, Join *join, int rtoffset) { Plan *outer_plan = join->plan.lefttree; Plan *inner_plan = join->plan.righttree; @@ -777,7 +777,7 @@ set_join_references(PlannerGlobal * glob, Join *join, int rtoffset) * recursion reaches the inner indexscan, and so we'd have done it twice. */ static void -set_inner_join_references(PlannerGlobal * glob, Plan *inner_plan, +set_inner_join_references(PlannerGlobal *glob, Plan *inner_plan, indexed_tlist *outer_itlist) { if (IsA(inner_plan, IndexScan)) @@ -969,7 +969,7 @@ set_inner_join_references(PlannerGlobal * glob, Plan *inner_plan, * the expression. */ static void -set_upper_references(PlannerGlobal * glob, Plan *plan, int rtoffset) +set_upper_references(PlannerGlobal *glob, Plan *plan, int rtoffset) { Plan *subplan = plan->lefttree; indexed_tlist *subplan_itlist; @@ -1254,7 +1254,7 @@ search_indexed_tlist_for_non_var(Node *node, * not modified. */ static List * -fix_join_expr(PlannerGlobal * glob, +fix_join_expr(PlannerGlobal *glob, List *clauses, indexed_tlist *outer_itlist, indexed_tlist *inner_itlist, @@ -1272,7 +1272,7 @@ fix_join_expr(PlannerGlobal * glob, } static Node * -fix_join_expr_mutator(Node *node, fix_join_expr_context * context) +fix_join_expr_mutator(Node *node, fix_join_expr_context *context) { Var *newvar; @@ -1385,7 +1385,7 @@ fix_join_expr_mutator(Node *node, fix_join_expr_context * context) * The original tree is not modified. */ static Node * -fix_upper_expr(PlannerGlobal * glob, +fix_upper_expr(PlannerGlobal *glob, Node *node, indexed_tlist *subplan_itlist, int rtoffset) @@ -1399,7 +1399,7 @@ fix_upper_expr(PlannerGlobal * glob, } static Node * -fix_upper_expr_mutator(Node *node, fix_upper_expr_context * context) +fix_upper_expr_mutator(Node *node, fix_upper_expr_context *context) { Var *newvar; @@ -1479,7 +1479,7 @@ fix_upper_expr_mutator(Node *node, fix_upper_expr_context * context) * they are not coming from a subplan. */ List * -set_returning_clause_references(PlannerGlobal * glob, +set_returning_clause_references(PlannerGlobal *glob, List *rlist, Plan *topplan, Index resultRelation) diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c index 8177f291b08..06b9d8adfb4 100644 --- a/src/backend/optimizer/plan/subselect.c +++ b/src/backend/optimizer/plan/subselect.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/subselect.c,v 1.126 2007/11/15 21:14:36 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/plan/subselect.c,v 1.127 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,7 +43,7 @@ typedef struct process_sublinks_context { PlannerInfo *root; bool isTopQual; -} process_sublinks_context; +} process_sublinks_context; typedef struct finalize_primnode_context { @@ -63,7 +63,7 @@ static bool subplan_is_hashable(SubLink *slink, SubPlan *node, Plan *plan); static bool hash_ok_operator(OpExpr *expr); static Node *replace_correlation_vars_mutator(Node *node, PlannerInfo *root); static Node *process_sublinks_mutator(Node *node, - process_sublinks_context * context); + process_sublinks_context *context); static Bitmapset *finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *outer_params, @@ -865,7 +865,7 @@ SS_process_sublinks(PlannerInfo *root, Node *expr, bool isQual) } static Node * -process_sublinks_mutator(Node *node, process_sublinks_context * context) +process_sublinks_mutator(Node *node, process_sublinks_context *context) { process_sublinks_context locContext; diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 85800ea3eaa..0561396f55b 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.224 2007/11/15 21:14:37 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.225 2007/11/15 22:25:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,10 +56,10 @@ static Node *transformArrayExpr(ParseState *pstate, ArrayExpr *a); static Node *transformRowExpr(ParseState *pstate, RowExpr *r); static Node *transformCoalesceExpr(ParseState *pstate, CoalesceExpr *c); static Node *transformMinMaxExpr(ParseState *pstate, MinMaxExpr *m); -static Node *transformXmlExpr(ParseState *pstate, XmlExpr * x); -static Node *transformXmlSerialize(ParseState *pstate, XmlSerialize * xs); +static Node *transformXmlExpr(ParseState *pstate, XmlExpr *x); +static Node *transformXmlSerialize(ParseState *pstate, XmlSerialize *xs); static Node *transformBooleanTest(ParseState *pstate, BooleanTest *b); -static Node *transformCurrentOfExpr(ParseState *pstate, CurrentOfExpr * cexpr); +static Node *transformCurrentOfExpr(ParseState *pstate, CurrentOfExpr *cexpr); static Node *transformColumnRef(ParseState *pstate, ColumnRef *cref); static Node *transformWholeRowRef(ParseState *pstate, char *schemaname, char *relname, int location); @@ -1411,7 +1411,7 @@ transformMinMaxExpr(ParseState *pstate, MinMaxExpr *m) } static Node * -transformXmlExpr(ParseState *pstate, XmlExpr * x) +transformXmlExpr(ParseState *pstate, XmlExpr *x) { XmlExpr *newx = makeNode(XmlExpr); ListCell *lc; @@ -1537,7 +1537,7 @@ transformXmlExpr(ParseState *pstate, XmlExpr * x) } static Node * -transformXmlSerialize(ParseState *pstate, XmlSerialize * xs) +transformXmlSerialize(ParseState *pstate, XmlSerialize *xs) { Oid targetType; int32 targetTypmod; @@ -1608,7 +1608,7 @@ transformBooleanTest(ParseState *pstate, BooleanTest *b) } static Node * -transformCurrentOfExpr(ParseState *pstate, CurrentOfExpr * cexpr) +transformCurrentOfExpr(ParseState *pstate, CurrentOfExpr *cexpr) { int sublevels_up; diff --git a/src/backend/port/dynloader/darwin.c b/src/backend/port/dynloader/darwin.c index 8d84bcfbb93..4c24682e67b 100644 --- a/src/backend/port/dynloader/darwin.c +++ b/src/backend/port/dynloader/darwin.c @@ -4,7 +4,7 @@ * If dlopen() is available (Darwin 10.3 and later), we just use it. * Otherwise we emulate it with the older, now deprecated, NSLinkModule API. * - * $PostgreSQL: pgsql/src/backend/port/dynloader/darwin.c,v 1.12 2007/11/15 21:14:37 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/port/dynloader/darwin.c,v 1.13 2007/11/15 22:25:15 momjian Exp $ */ #include "postgres.h" @@ -75,13 +75,14 @@ pg_dlclose(void *handle) PGFunction pg_dlsym(void *handle, char *funcname) { - NSSymbol symbol; + NSSymbol symbol; char *symname = (char *) malloc(strlen(funcname) + 2); sprintf(symname, "_%s", funcname); if (NSIsSymbolNameDefined(symname)) { symbol = NSLookupAndBindSymbol(symname); + free(symname); return (PGFunction) NSAddressOfSymbol(symbol); } diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 060fc06dfad..3495b09bfb5 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -55,7 +55,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.68 2007/11/15 21:14:37 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.69 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -144,7 +144,7 @@ typedef struct avl_dbase Oid adl_datid; /* hash key -- must be first */ TimestampTz adl_next_worker; int adl_score; -} avl_dbase; +} avl_dbase; /* struct to keep track of databases in worker */ typedef struct avw_dbase @@ -153,14 +153,14 @@ typedef struct avw_dbase char *adw_name; TransactionId adw_frozenxid; PgStat_StatDBEntry *adw_entry; -} avw_dbase; +} avw_dbase; /* struct to keep track of tables to vacuum and/or analyze, in 1st pass */ typedef struct av_relation { Oid ar_relid; Oid ar_toastrelid; -} av_relation; +} av_relation; /* struct to keep track of tables to vacuum and/or analyze, after rechecking */ typedef struct autovac_table @@ -202,7 +202,7 @@ typedef struct WorkerInfoData int wi_cost_delay; int wi_cost_limit; int wi_cost_limit_base; -} WorkerInfoData; +} WorkerInfoData; typedef struct WorkerInfoData *WorkerInfo; @@ -240,7 +240,7 @@ typedef struct SHMEM_OFFSET av_freeWorkers; SHM_QUEUE av_runningWorkers; SHMEM_OFFSET av_startingWorker; -} AutoVacuumShmemStruct; +} AutoVacuumShmemStruct; static AutoVacuumShmemStruct *AutoVacuumShmem; @@ -2392,8 +2392,8 @@ table_recheck_autovac(Oid relid) int vac_cost_delay; /* - * Calculate the vacuum cost parameters and the minimum freeze age. - * If there is a tuple in pg_autovacuum, use it; else, use the GUC + * Calculate the vacuum cost parameters and the minimum freeze age. If + * there is a tuple in pg_autovacuum, use it; else, use the GUC * defaults. Note that the fields may contain "-1" (or indeed any * negative value), which means use the GUC defaults for each setting. * In cost_limit, the value 0 also means to use the value from diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index 22ba2ee3449..8f9590d5c15 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -13,7 +13,7 @@ * * Copyright (c) 2001-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.167 2007/11/15 21:14:37 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.168 2007/11/15 22:25:16 momjian Exp $ * ---------- */ #include "postgres.h" @@ -134,7 +134,7 @@ typedef struct TabStatusArray struct TabStatusArray *tsa_next; /* link to next array, if any */ int tsa_used; /* # entries currently used */ PgStat_TableStatus tsa_entries[TABSTAT_QUANTUM]; /* per-table data */ -} TabStatusArray; +} TabStatusArray; static TabStatusArray *pgStatTabList = NULL; @@ -150,7 +150,7 @@ typedef struct PgStat_SubXactStatus int nest_level; /* subtransaction nest level */ struct PgStat_SubXactStatus *prev; /* higher-level subxact if any */ PgStat_TableXactStatus *first; /* head of list for this subxact */ -} PgStat_SubXactStatus; +} PgStat_SubXactStatus; static PgStat_SubXactStatus *pgStatXactStack = NULL; @@ -164,7 +164,7 @@ typedef struct TwoPhasePgStatRecord PgStat_Counter tuples_deleted; /* tuples deleted in xact */ Oid t_id; /* table's OID */ bool t_shared; /* is it a shared catalog? */ -} TwoPhasePgStatRecord; +} TwoPhasePgStatRecord; /* * Info about current "snapshot" of stats file @@ -221,7 +221,7 @@ static void pgstat_recv_resetcounter(PgStat_MsgResetcounter *msg, int len); static void pgstat_recv_autovac(PgStat_MsgAutovacStart *msg, int len); static void pgstat_recv_vacuum(PgStat_MsgVacuum *msg, int len); static void pgstat_recv_analyze(PgStat_MsgAnalyze *msg, int len); -static void pgstat_recv_bgwriter(PgStat_MsgBgWriter * msg, int len); +static void pgstat_recv_bgwriter(PgStat_MsgBgWriter *msg, int len); /* ------------------------------------------------------------ @@ -1203,7 +1203,7 @@ get_tabstat_stack_level(int nest_level) * add_tabstat_xact_level - add a new (sub)transaction state record */ static void -add_tabstat_xact_level(PgStat_TableStatus * pgstat_info, int nest_level) +add_tabstat_xact_level(PgStat_TableStatus *pgstat_info, int nest_level) { PgStat_SubXactStatus *xact_state; PgStat_TableXactStatus *trans; @@ -2365,7 +2365,7 @@ PgstatCollectorMain(int argc, char *argv[]) break; case PGSTAT_MTYPE_BGWRITER: - pgstat_recv_bgwriter((PgStat_MsgBgWriter *) & msg, len); + pgstat_recv_bgwriter((PgStat_MsgBgWriter *) &msg, len); break; default: @@ -3160,7 +3160,7 @@ pgstat_recv_analyze(PgStat_MsgAnalyze *msg, int len) * ---------- */ static void -pgstat_recv_bgwriter(PgStat_MsgBgWriter * msg, int len) +pgstat_recv_bgwriter(PgStat_MsgBgWriter *msg, int len) { globalStats.timed_checkpoints += msg->m_timed_checkpoints; globalStats.requested_checkpoints += msg->m_requested_checkpoints; diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index c83e4e73d80..679831053db 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.547 2007/11/15 21:14:37 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.548 2007/11/15 22:25:16 momjian Exp $ * * NOTES * @@ -257,7 +257,7 @@ typedef enum PM_SHUTDOWN, /* waiting for bgwriter to do shutdown ckpt */ PM_WAIT_DEAD_END, /* waiting for dead_end children to exit */ PM_NO_CHILDREN /* all important children have exited */ -} PMState; +} PMState; static PMState pmState = PM_INIT; diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c index 0a255b5e076..3c6960e9b19 100644 --- a/src/backend/postmaster/syslogger.c +++ b/src/backend/postmaster/syslogger.c @@ -18,7 +18,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.41 2007/11/15 21:14:37 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.42 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -103,7 +103,7 @@ typedef struct { int32 pid; /* PID of source process */ StringInfoData data; /* accumulated data, as a StringInfo */ -} save_buffer; +} save_buffer; #define CHUNK_SLOTS 20 static save_buffer saved_chunks[CHUNK_SLOTS]; diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c index 94786975d70..a309ba22938 100644 --- a/src/backend/snowball/dict_snowball.c +++ b/src/backend/snowball/dict_snowball.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/snowball/dict_snowball.c,v 1.4 2007/11/15 21:14:37 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/snowball/dict_snowball.c,v 1.5 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -78,7 +78,7 @@ typedef struct stemmer_module struct SN_env *(*create) (void); void (*close) (struct SN_env *); int (*stem) (struct SN_env *); -} stemmer_module; +} stemmer_module; static const stemmer_module stemmer_modules[] = { @@ -140,11 +140,11 @@ typedef struct DictSnowball * context, so we just remember CurrentMemoryContext */ MemoryContext dictCtx; -} DictSnowball; +} DictSnowball; static void -locate_stem_module(DictSnowball * d, char *lang) +locate_stem_module(DictSnowball *d, char *lang) { const stemmer_module *m; diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index b1219b58f75..506bbcaf5ce 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/buffer/freelist.c,v 1.62 2007/11/15 21:14:37 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/storage/buffer/freelist.c,v 1.63 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -77,7 +77,7 @@ typedef struct BufferAccessStrategyData * struct. */ Buffer buffers[1]; /* VARIABLE SIZE ARRAY */ -} BufferAccessStrategyData; +} BufferAccessStrategyData; /* Prototypes for internal functions */ diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index 0211b3f74e7..d6a7b641ebc 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/smgr/md.c,v 1.132 2007/11/15 21:49:47 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/storage/smgr/md.c,v 1.133 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -125,7 +125,7 @@ typedef struct { RelFileNode rnode; /* the targeted relation */ BlockNumber segno; /* which segment */ -} PendingOperationTag; +} PendingOperationTag; typedef uint16 CycleCtr; /* can be any convenient integer size */ @@ -140,7 +140,7 @@ typedef struct { RelFileNode rnode; /* the dead relation to delete */ CycleCtr cycle_ctr; /* mdckpt_cycle_ctr when request was made */ -} PendingUnlinkEntry; +} PendingUnlinkEntry; static HTAB *pendingOpsTable = NULL; static List *pendingUnlinks = NIL; @@ -154,7 +154,7 @@ typedef enum /* behavior for mdopen & _mdfd_getseg */ EXTENSION_FAIL, /* ereport if segment not present */ EXTENSION_RETURN_NULL, /* return NULL if not present */ EXTENSION_CREATE /* create new segments as needed */ -} ExtensionBehavior; +} ExtensionBehavior; /* local routines */ static MdfdVec *mdopen(SMgrRelation reln, ExtensionBehavior behavior); @@ -318,12 +318,12 @@ mdunlink(RelFileNode rnode, bool isRedo) else { /* truncate(2) would be easier here, but Windows hasn't got it */ - int fd; + int fd; fd = BasicOpenFile(path, O_RDWR | PG_BINARY, 0); if (fd >= 0) { - int save_errno; + int save_errno; ret = ftruncate(fd, 0); save_errno = errno; diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index 72d20cd3ca8..77802209848 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.118 2007/11/15 21:14:38 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.119 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ Portal ActivePortal = NULL; -static void ProcessQuery(PlannedStmt * plan, +static void ProcessQuery(PlannedStmt *plan, ParamListInfo params, DestReceiver *dest, char *completionTag); @@ -57,7 +57,7 @@ static void DoPortalRewind(Portal portal); * CreateQueryDesc */ QueryDesc * -CreateQueryDesc(PlannedStmt * plannedstmt, +CreateQueryDesc(PlannedStmt *plannedstmt, Snapshot snapshot, Snapshot crosscheck_snapshot, DestReceiver *dest, @@ -141,7 +141,7 @@ FreeQueryDesc(QueryDesc *qdesc) * error; otherwise the executor's memory usage will be leaked. */ static void -ProcessQuery(PlannedStmt * plan, +ProcessQuery(PlannedStmt *plan, ParamListInfo params, DestReceiver *dest, char *completionTag) diff --git a/src/backend/tsearch/dict_ispell.c b/src/backend/tsearch/dict_ispell.c index 1267a301eec..d9c02610bb9 100644 --- a/src/backend/tsearch/dict_ispell.c +++ b/src/backend/tsearch/dict_ispell.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/dict_ispell.c,v 1.4 2007/11/15 21:14:38 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/dict_ispell.c,v 1.5 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,7 @@ typedef struct { StopList stoplist; IspellDict obj; -} DictISpell; +} DictISpell; Datum dispell_init(PG_FUNCTION_ARGS) diff --git a/src/backend/tsearch/dict_simple.c b/src/backend/tsearch/dict_simple.c index c2160ab34a2..06926f4e937 100644 --- a/src/backend/tsearch/dict_simple.c +++ b/src/backend/tsearch/dict_simple.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/dict_simple.c,v 1.5 2007/11/15 21:14:38 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/dict_simple.c,v 1.6 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ typedef struct { StopList stoplist; bool accept; -} DictSimple; +} DictSimple; Datum diff --git a/src/backend/tsearch/dict_synonym.c b/src/backend/tsearch/dict_synonym.c index 649350745c0..01126abe76a 100644 --- a/src/backend/tsearch/dict_synonym.c +++ b/src/backend/tsearch/dict_synonym.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/dict_synonym.c,v 1.5 2007/11/15 21:14:38 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/dict_synonym.c,v 1.6 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,13 +24,13 @@ typedef struct { char *in; char *out; -} Syn; +} Syn; typedef struct { int len; /* length of syn array */ Syn *syn; -} DictSyn; +} DictSyn; /* * Finds the next whitespace-delimited word within the 'in' string. diff --git a/src/backend/tsearch/dict_thesaurus.c b/src/backend/tsearch/dict_thesaurus.c index e6beb68438d..a1c77c6a348 100644 --- a/src/backend/tsearch/dict_thesaurus.c +++ b/src/backend/tsearch/dict_thesaurus.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/dict_thesaurus.c,v 1.7 2007/11/15 21:14:38 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/dict_thesaurus.c,v 1.8 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,20 +35,20 @@ typedef struct LexemeInfo uint16 tnvariant; /* total num lexemes in one variant */ struct LexemeInfo *nextentry; struct LexemeInfo *nextvariant; -} LexemeInfo; +} LexemeInfo; typedef struct { char *lexeme; LexemeInfo *entries; -} TheLexeme; +} TheLexeme; typedef struct { uint16 lastlexeme; /* number lexemes to substitute */ uint16 reslen; TSLexeme *res; /* prepared substituted result */ -} TheSubstitute; +} TheSubstitute; typedef struct { @@ -66,11 +66,11 @@ typedef struct */ TheSubstitute *subst; int nsubst; -} DictThesaurus; +} DictThesaurus; static void -newLexeme(DictThesaurus * d, char *b, char *e, uint16 idsubst, uint16 posinsubst) +newLexeme(DictThesaurus *d, char *b, char *e, uint16 idsubst, uint16 posinsubst) { TheLexeme *ptr; @@ -104,7 +104,7 @@ newLexeme(DictThesaurus * d, char *b, char *e, uint16 idsubst, uint16 posinsubst } static void -addWrd(DictThesaurus * d, char *b, char *e, uint16 idsubst, uint16 nwrd, uint16 posinsubst, bool useasis) +addWrd(DictThesaurus *d, char *b, char *e, uint16 idsubst, uint16 nwrd, uint16 posinsubst, bool useasis) { static int nres = 0; static int ntres = 0; @@ -167,7 +167,7 @@ addWrd(DictThesaurus * d, char *b, char *e, uint16 idsubst, uint16 nwrd, uint16 #define TR_INSUBS 4 static void -thesaurusRead(char *filename, DictThesaurus * d) +thesaurusRead(char *filename, DictThesaurus *d) { FILE *fh; int lineno = 0; @@ -311,7 +311,7 @@ thesaurusRead(char *filename, DictThesaurus * d) } static TheLexeme * -addCompiledLexeme(TheLexeme * newwrds, int *nnw, int *tnm, TSLexeme * lexeme, LexemeInfo * src, uint16 tnvariant) +addCompiledLexeme(TheLexeme *newwrds, int *nnw, int *tnm, TSLexeme *lexeme, LexemeInfo *src, uint16 tnvariant) { if (*nnw >= *tnm) @@ -343,7 +343,7 @@ addCompiledLexeme(TheLexeme * newwrds, int *nnw, int *tnm, TSLexeme * lexeme, Le } static int -cmpLexemeInfo(LexemeInfo * a, LexemeInfo * b) +cmpLexemeInfo(LexemeInfo *a, LexemeInfo *b) { if (a == NULL || b == NULL) return 0; @@ -365,7 +365,7 @@ cmpLexemeInfo(LexemeInfo * a, LexemeInfo * b) } static int -cmpLexeme(TheLexeme * a, TheLexeme * b) +cmpLexeme(TheLexeme *a, TheLexeme *b) { if (a->lexeme == NULL) { @@ -400,7 +400,7 @@ cmpTheLexeme(const void *a, const void *b) } static void -compileTheLexeme(DictThesaurus * d) +compileTheLexeme(DictThesaurus *d) { int i, nnw = 0, @@ -503,7 +503,7 @@ compileTheLexeme(DictThesaurus * d) } static void -compileTheSubstitute(DictThesaurus * d) +compileTheSubstitute(DictThesaurus *d) { int i; @@ -651,7 +651,7 @@ thesaurus_init(PG_FUNCTION_ARGS) } static LexemeInfo * -findTheLexeme(DictThesaurus * d, char *lexeme) +findTheLexeme(DictThesaurus *d, char *lexeme) { TheLexeme key, *res; @@ -670,7 +670,7 @@ findTheLexeme(DictThesaurus * d, char *lexeme) } static bool -matchIdSubst(LexemeInfo * stored, uint16 idsubst) +matchIdSubst(LexemeInfo *stored, uint16 idsubst) { bool res = true; @@ -690,7 +690,7 @@ matchIdSubst(LexemeInfo * stored, uint16 idsubst) } static LexemeInfo * -findVariant(LexemeInfo * in, LexemeInfo * stored, uint16 curpos, LexemeInfo ** newin, int newn) +findVariant(LexemeInfo *in, LexemeInfo *stored, uint16 curpos, LexemeInfo **newin, int newn) { for (;;) { @@ -749,7 +749,7 @@ findVariant(LexemeInfo * in, LexemeInfo * stored, uint16 curpos, LexemeInfo ** n } static TSLexeme * -copyTSLexeme(TheSubstitute * ts) +copyTSLexeme(TheSubstitute *ts) { TSLexeme *res; uint16 i; @@ -767,7 +767,7 @@ copyTSLexeme(TheSubstitute * ts) } static TSLexeme * -checkMatch(DictThesaurus * d, LexemeInfo * info, uint16 curpos, bool *moreres) +checkMatch(DictThesaurus *d, LexemeInfo *info, uint16 curpos, bool *moreres) { *moreres = false; while (info) diff --git a/src/backend/tsearch/regis.c b/src/backend/tsearch/regis.c index 705dd96b4ac..46dd1792c23 100644 --- a/src/backend/tsearch/regis.c +++ b/src/backend/tsearch/regis.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/regis.c,v 1.1 2007/08/21 01:11:18 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/regis.c,v 1.2 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,7 +39,7 @@ RS_isRegis(const char *str) #define RS_IN_WAIT 4 static RegisNode * -newRegisNode(RegisNode * prev, int len) +newRegisNode(RegisNode *prev, int len) { RegisNode *ptr; @@ -50,7 +50,7 @@ newRegisNode(RegisNode * prev, int len) } void -RS_compile(Regis * r, bool issuffix, char *str) +RS_compile(Regis *r, bool issuffix, char *str) { int len = strlen(str); int state = RS_IN_WAIT; @@ -137,7 +137,7 @@ RS_compile(Regis * r, bool issuffix, char *str) } void -RS_free(Regis * r) +RS_free(Regis *r) { RegisNode *ptr = r->node, *tmp; @@ -189,7 +189,7 @@ mb_strchr(char *str, char *c) bool -RS_execute(Regis * r, char *str) +RS_execute(Regis *r, char *str) { RegisNode *ptr = r->node; char *c = str; diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c index 765691903a7..fdb606d213e 100644 --- a/src/backend/tsearch/spell.c +++ b/src/backend/tsearch/spell.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/spell.c,v 1.6 2007/11/15 21:14:38 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/spell.c,v 1.7 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -165,7 +165,7 @@ cmpaffix(const void *s1, const void *s2) } static void -NIAddSpell(IspellDict * Conf, const char *word, const char *flag) +NIAddSpell(IspellDict *Conf, const char *word, const char *flag) { if (Conf->nspell >= Conf->mspell) { @@ -192,7 +192,7 @@ NIAddSpell(IspellDict * Conf, const char *word, const char *flag) * Note caller must already have applied get_tsearch_config_filename */ void -NIImportDictionary(IspellDict * Conf, const char *filename) +NIImportDictionary(IspellDict *Conf, const char *filename) { FILE *dict; char *line; @@ -255,7 +255,7 @@ NIImportDictionary(IspellDict * Conf, const char *filename) static int -FindWord(IspellDict * Conf, const char *word, int affixflag, int flag) +FindWord(IspellDict *Conf, const char *word, int affixflag, int flag) { SPNode *node = Conf->Dictionary; SPNodeData *StopLow, @@ -303,7 +303,7 @@ FindWord(IspellDict * Conf, const char *word, int affixflag, int flag) } static void -NIAddAffix(IspellDict * Conf, int flag, char flagflags, const char *mask, const char *find, const char *repl, int type) +NIAddAffix(IspellDict *Conf, int flag, char flagflags, const char *mask, const char *find, const char *repl, int type) { AFFIX *Affix; @@ -512,7 +512,7 @@ parse_affentry(char *str, char *mask, char *find, char *repl, } static void -addFlagValue(IspellDict * Conf, char *s, uint32 val, +addFlagValue(IspellDict *Conf, char *s, uint32 val, const char *filename, int lineno) { while (*s && t_isspace(s)) @@ -535,7 +535,7 @@ addFlagValue(IspellDict * Conf, char *s, uint32 val, } static void -NIImportOOAffixes(IspellDict * Conf, const char *filename) +NIImportOOAffixes(IspellDict *Conf, const char *filename) { char type[BUFSIZ], *ptype = NULL; @@ -702,7 +702,7 @@ nextline: * Note caller must already have applied get_tsearch_config_filename */ void -NIImportAffixes(IspellDict * Conf, const char *filename) +NIImportAffixes(IspellDict *Conf, const char *filename) { char *pstr = NULL; char mask[BUFSIZ]; @@ -842,7 +842,7 @@ nextline: } static int -MergeAffix(IspellDict * Conf, int a1, int a2) +MergeAffix(IspellDict *Conf, int a1, int a2) { char **ptr; @@ -865,7 +865,7 @@ MergeAffix(IspellDict * Conf, int a1, int a2) } static uint32 -makeCompoundFlags(IspellDict * Conf, int affix) +makeCompoundFlags(IspellDict *Conf, int affix) { uint32 flag = 0; char *str = Conf->AffixData[affix]; @@ -880,7 +880,7 @@ makeCompoundFlags(IspellDict * Conf, int affix) } static SPNode * -mkSPNode(IspellDict * Conf, int low, int high, int level) +mkSPNode(IspellDict *Conf, int low, int high, int level) { int i; int nchar = 0; @@ -960,7 +960,7 @@ mkSPNode(IspellDict * Conf, int low, int high, int level) * and affixes. */ void -NISortDictionary(IspellDict * Conf) +NISortDictionary(IspellDict *Conf) { int i; int naffix = 0; @@ -1011,7 +1011,7 @@ NISortDictionary(IspellDict * Conf) } static AffixNode * -mkANode(IspellDict * Conf, int low, int high, int level, int type) +mkANode(IspellDict *Conf, int low, int high, int level, int type) { int i; int nchar = 0; @@ -1082,7 +1082,7 @@ mkANode(IspellDict * Conf, int low, int high, int level, int type) } static void -mkVoidAffix(IspellDict * Conf, bool issuffix, int startsuffix) +mkVoidAffix(IspellDict *Conf, bool issuffix, int startsuffix) { int i, cnt = 0; @@ -1125,7 +1125,7 @@ mkVoidAffix(IspellDict * Conf, bool issuffix, int startsuffix) } static bool -isAffixInUse(IspellDict * Conf, char flag) +isAffixInUse(IspellDict *Conf, char flag) { int i; @@ -1137,7 +1137,7 @@ isAffixInUse(IspellDict * Conf, char flag) } void -NISortAffixes(IspellDict * Conf) +NISortAffixes(IspellDict *Conf) { AFFIX *Affix; size_t i; @@ -1187,12 +1187,12 @@ NISortAffixes(IspellDict * Conf) } static AffixNodeData * -FindAffixes(AffixNode * node, const char *word, int wrdlen, int *level, int type) +FindAffixes(AffixNode *node, const char *word, int wrdlen, int *level, int type) { AffixNodeData *StopLow, *StopHigh, *StopMiddle; - uint8 symbol; + uint8 symbol; if (node->isvoid) { /* search void affixes */ @@ -1209,6 +1209,7 @@ FindAffixes(AffixNode * node, const char *word, int wrdlen, int *level, int type { StopMiddle = StopLow + ((StopHigh - StopLow) >> 1); symbol = GETWCHAR(word, wrdlen, *level, type); + if (StopMiddle->val == symbol) { (*level)++; @@ -1229,7 +1230,7 @@ FindAffixes(AffixNode * node, const char *word, int wrdlen, int *level, int type } static char * -CheckAffix(const char *word, size_t len, AFFIX * Affix, int flagflags, char *newword, int *baselen) +CheckAffix(const char *word, size_t len, AFFIX *Affix, int flagflags, char *newword, int *baselen) { /* * Check compound allow flags @@ -1335,7 +1336,7 @@ addToResult(char **forms, char **cur, char *word) } static char ** -NormalizeSubWord(IspellDict * Conf, char *word, int flag) +NormalizeSubWord(IspellDict *Conf, char *word, int flag) { AffixNodeData *suffix = NULL, *prefix = NULL; @@ -1449,10 +1450,10 @@ typedef struct SplitVar int nstem; char **stem; struct SplitVar *next; -} SplitVar; +} SplitVar; static int -CheckCompoundAffixes(CMPDAffix ** ptr, char *word, int len, bool CheckInPlace) +CheckCompoundAffixes(CMPDAffix **ptr, char *word, int len, bool CheckInPlace) { bool issuffix; @@ -1490,7 +1491,7 @@ CheckCompoundAffixes(CMPDAffix ** ptr, char *word, int len, bool CheckInPlace) } static SplitVar * -CopyVar(SplitVar * s, int makedup) +CopyVar(SplitVar *s, int makedup) { SplitVar *v = (SplitVar *) palloc(sizeof(SplitVar)); @@ -1511,7 +1512,7 @@ CopyVar(SplitVar * s, int makedup) static SplitVar * -SplitToVariants(IspellDict * Conf, SPNode * snode, SplitVar * orig, char *word, int wordlen, int startpos, int minpos) +SplitToVariants(IspellDict *Conf, SPNode *snode, SplitVar *orig, char *word, int wordlen, int startpos, int minpos) { SplitVar *var = NULL; SPNodeData *StopLow, @@ -1660,7 +1661,7 @@ SplitToVariants(IspellDict * Conf, SPNode * snode, SplitVar * orig, char *word, } TSLexeme * -NINormalizeWord(IspellDict * Conf, char *word) +NINormalizeWord(IspellDict *Conf, char *word) { char **res; TSLexeme *lcur = NULL, diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c index 3a2bbfd2fc7..febd9293f2d 100644 --- a/src/backend/tsearch/to_tsany.c +++ b/src/backend/tsearch/to_tsany.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/to_tsany.c,v 1.6 2007/11/15 21:14:38 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/to_tsany.c,v 1.7 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -52,7 +52,7 @@ compareWORD(const void *a, const void *b) } static int -uniqueWORD(ParsedWord * a, int4 l) +uniqueWORD(ParsedWord *a, int4 l) { ParsedWord *ptr, *res; @@ -138,7 +138,7 @@ uniqueWORD(ParsedWord * a, int4 l) * make value of tsvector, given parsed text */ TSVector -make_tsvector(ParsedText * prs) +make_tsvector(ParsedText *prs) { int i, j, diff --git a/src/backend/tsearch/ts_parse.c b/src/backend/tsearch/ts_parse.c index 5ceebcf0610..ef54af3935f 100644 --- a/src/backend/tsearch/ts_parse.c +++ b/src/backend/tsearch/ts_parse.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/ts_parse.c,v 1.4 2007/11/15 21:14:38 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/ts_parse.c,v 1.5 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,13 +31,13 @@ typedef struct ParsedLex int lenlemm; bool resfollow; struct ParsedLex *next; -} ParsedLex; +} ParsedLex; typedef struct ListParsedLex { ParsedLex *head; ParsedLex *tail; -} ListParsedLex; +} ListParsedLex; typedef struct { @@ -56,10 +56,10 @@ typedef struct ParsedLex *lastRes; TSLexeme *tmpRes; -} LexizeData; +} LexizeData; static void -LexizeInit(LexizeData * ld, TSConfigCacheEntry * cfg) +LexizeInit(LexizeData *ld, TSConfigCacheEntry *cfg) { ld->cfg = cfg; ld->curDictId = InvalidOid; @@ -71,7 +71,7 @@ LexizeInit(LexizeData * ld, TSConfigCacheEntry * cfg) } static void -LPLAddTail(ListParsedLex * list, ParsedLex * newpl) +LPLAddTail(ListParsedLex *list, ParsedLex *newpl) { if (list->tail) { @@ -84,7 +84,7 @@ LPLAddTail(ListParsedLex * list, ParsedLex * newpl) } static ParsedLex * -LPLRemoveHead(ListParsedLex * list) +LPLRemoveHead(ListParsedLex *list) { ParsedLex *res = list->head; @@ -98,7 +98,7 @@ LPLRemoveHead(ListParsedLex * list) } static void -LexizeAddLemm(LexizeData * ld, int type, char *lemm, int lenlemm) +LexizeAddLemm(LexizeData *ld, int type, char *lemm, int lenlemm) { ParsedLex *newpl = (ParsedLex *) palloc(sizeof(ParsedLex)); @@ -111,7 +111,7 @@ LexizeAddLemm(LexizeData * ld, int type, char *lemm, int lenlemm) } static void -RemoveHead(LexizeData * ld) +RemoveHead(LexizeData *ld) { LPLAddTail(&ld->waste, LPLRemoveHead(&ld->towork)); @@ -119,7 +119,7 @@ RemoveHead(LexizeData * ld) } static void -setCorrLex(LexizeData * ld, ParsedLex ** correspondLexem) +setCorrLex(LexizeData *ld, ParsedLex **correspondLexem) { if (correspondLexem) { @@ -141,7 +141,7 @@ setCorrLex(LexizeData * ld, ParsedLex ** correspondLexem) } static void -moveToWaste(LexizeData * ld, ParsedLex * stop) +moveToWaste(LexizeData *ld, ParsedLex *stop) { bool go = true; @@ -157,7 +157,7 @@ moveToWaste(LexizeData * ld, ParsedLex * stop) } static void -setNewTmpRes(LexizeData * ld, ParsedLex * lex, TSLexeme * res) +setNewTmpRes(LexizeData *ld, ParsedLex *lex, TSLexeme *res) { if (ld->tmpRes) { @@ -172,7 +172,7 @@ setNewTmpRes(LexizeData * ld, ParsedLex * lex, TSLexeme * res) } static TSLexeme * -LexizeExec(LexizeData * ld, ParsedLex ** correspondLexem) +LexizeExec(LexizeData *ld, ParsedLex **correspondLexem) { int i; ListDictionary *map; @@ -349,7 +349,7 @@ LexizeExec(LexizeData * ld, ParsedLex ** correspondLexem) * prs will be filled in. */ void -parsetext(Oid cfgId, ParsedText * prs, char *buf, int buflen) +parsetext(Oid cfgId, ParsedText *prs, char *buf, int buflen) { int type, lenlemm; @@ -429,7 +429,7 @@ parsetext(Oid cfgId, ParsedText * prs, char *buf, int buflen) * Headline framework */ static void -hladdword(HeadlineParsedText * prs, char *buf, int buflen, int type) +hladdword(HeadlineParsedText *prs, char *buf, int buflen, int type) { while (prs->curwords >= prs->lenwords) { @@ -445,7 +445,7 @@ hladdword(HeadlineParsedText * prs, char *buf, int buflen, int type) } static void -hlfinditem(HeadlineParsedText * prs, TSQuery query, char *buf, int buflen) +hlfinditem(HeadlineParsedText *prs, TSQuery query, char *buf, int buflen) { int i; QueryItem *item = GETQUERY(query); @@ -479,7 +479,7 @@ hlfinditem(HeadlineParsedText * prs, TSQuery query, char *buf, int buflen) } static void -addHLParsedLex(HeadlineParsedText * prs, TSQuery query, ParsedLex * lexs, TSLexeme * norms) +addHLParsedLex(HeadlineParsedText *prs, TSQuery query, ParsedLex *lexs, TSLexeme *norms) { ParsedLex *tmplexs; TSLexeme *ptr; @@ -515,7 +515,7 @@ addHLParsedLex(HeadlineParsedText * prs, TSQuery query, ParsedLex * lexs, TSLexe } void -hlparsetext(Oid cfgId, HeadlineParsedText * prs, TSQuery query, char *buf, int buflen) +hlparsetext(Oid cfgId, HeadlineParsedText *prs, TSQuery query, char *buf, int buflen) { int type, lenlemm; @@ -575,7 +575,7 @@ hlparsetext(Oid cfgId, HeadlineParsedText * prs, TSQuery query, char *buf, int b } text * -generateHeadline(HeadlineParsedText * prs) +generateHeadline(HeadlineParsedText *prs) { text *out; int len = 128; diff --git a/src/backend/tsearch/ts_utils.c b/src/backend/tsearch/ts_utils.c index 39c8713a234..3aeb478a339 100644 --- a/src/backend/tsearch/ts_utils.c +++ b/src/backend/tsearch/ts_utils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/ts_utils.c,v 1.6 2007/11/15 21:14:38 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/ts_utils.c,v 1.7 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -74,7 +74,7 @@ comparestr(const void *a, const void *b) * or palloc a new version. */ void -readstoplist(const char *fname, StopList * s, char *(*wordop) (const char *)) +readstoplist(const char *fname, StopList *s, char *(*wordop) (const char *)) { char **stop = NULL; @@ -147,7 +147,7 @@ readstoplist(const char *fname, StopList * s, char *(*wordop) (const char *)) } bool -searchstoplist(StopList * s, char *key) +searchstoplist(StopList *s, char *key) { return (s->stop && s->len > 0 && bsearch(&key, s->stop, s->len, diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c index 147834c3754..da1651e75e9 100644 --- a/src/backend/tsearch/wparser.c +++ b/src/backend/tsearch/wparser.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/wparser.c,v 1.4 2007/11/15 21:14:38 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/wparser.c,v 1.5 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,7 +37,7 @@ typedef struct { int cur; LexDescr *list; -} TSTokenTypeStorage; +} TSTokenTypeStorage; static void tt_setup_firstcall(FuncCallContext *funcctx, Oid prsid) @@ -150,14 +150,14 @@ typedef struct { int type; char *lexeme; -} LexemeEntry; +} LexemeEntry; typedef struct { int cur; int len; LexemeEntry *list; -} PrsStorage; +} PrsStorage; static void diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c index ca2ee9d4590..3f95f60579e 100644 --- a/src/backend/tsearch/wparser_def.c +++ b/src/backend/tsearch/wparser_def.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.9 2007/11/15 21:14:38 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.10 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -189,7 +189,7 @@ typedef enum TPS_InHyphenNumWordPart, TPS_InHyphenUnsignedInt, TPS_Null /* last state (fake value) */ -} TParserState; +} TParserState; /* forward declaration */ struct TParser; @@ -207,7 +207,7 @@ typedef struct TParserState tostate; int type; TParserSpecial special; -} TParserStateActionItem; +} TParserStateActionItem; /* Flag bits in TParserStateActionItem.flags */ #define A_NEXT 0x0000 @@ -229,7 +229,7 @@ typedef struct TParserPosition TParserState state; struct TParserPosition *prev; const TParserStateActionItem *pushedAtAction; -} TParserPosition; +} TParserPosition; typedef struct TParser { @@ -256,15 +256,15 @@ typedef struct TParser int lenbytetoken; int lenchartoken; int type; -} TParser; +} TParser; /* forward decls here */ -static bool TParserGet(TParser * prs); +static bool TParserGet(TParser *prs); static TParserPosition * -newTParserPosition(TParserPosition * prev) +newTParserPosition(TParserPosition *prev) { TParserPosition *res = (TParserPosition *) palloc(sizeof(TParserPosition)); @@ -316,7 +316,7 @@ TParserInit(char *str, int len) } static void -TParserClose(TParser * prs) +TParserClose(TParser *prs) { while (prs->state) { @@ -365,7 +365,7 @@ p_isnot##type(TParser *prs) { \ } static int -p_isalnum(TParser * prs) +p_isalnum(TParser *prs) { Assert(prs->state); @@ -391,13 +391,13 @@ p_isalnum(TParser * prs) return isalnum(*(unsigned char *) (prs->str + prs->state->posbyte)); } static int -p_isnotalnum(TParser * prs) +p_isnotalnum(TParser *prs) { return !p_isalnum(prs); } static int -p_isalpha(TParser * prs) +p_isalpha(TParser *prs) { Assert(prs->state); @@ -424,7 +424,7 @@ p_isalpha(TParser * prs) } static int -p_isnotalpha(TParser * prs) +p_isnotalpha(TParser *prs) { return !p_isalpha(prs); } @@ -432,7 +432,7 @@ p_isnotalpha(TParser * prs) /* p_iseq should be used only for ascii symbols */ static int -p_iseq(TParser * prs, char c) +p_iseq(TParser *prs, char c) { Assert(prs->state); return ((prs->state->charlen == 1 && *(prs->str + prs->state->posbyte) == c)) ? 1 : 0; @@ -453,7 +453,7 @@ p_isnot##type(TParser *prs) { \ static int -p_iseq(TParser * prs, char c) +p_iseq(TParser *prs, char c) { Assert(prs->state); return (*(prs->str + prs->state->posbyte) == c) ? 1 : 0; @@ -472,32 +472,32 @@ p_iswhat(upper) p_iswhat(xdigit) static int -p_isEOF(TParser * prs) +p_isEOF(TParser *prs) { Assert(prs->state); return (prs->state->posbyte == prs->lenstr || prs->state->charlen == 0) ? 1 : 0; } static int -p_iseqC(TParser * prs) +p_iseqC(TParser *prs) { return p_iseq(prs, prs->c); } static int -p_isneC(TParser * prs) +p_isneC(TParser *prs) { return !p_iseq(prs, prs->c); } static int -p_isascii(TParser * prs) +p_isascii(TParser *prs) { return (prs->state->charlen == 1 && isascii((unsigned char) *(prs->str + prs->state->posbyte))) ? 1 : 0; } static int -p_isasclet(TParser * prs) +p_isasclet(TParser *prs) { return (p_isascii(prs) && p_isalpha(prs)) ? 1 : 0; } @@ -533,7 +533,7 @@ _make_compiler_happy(void) static void -SpecialTags(TParser * prs) +SpecialTags(TParser *prs) { switch (prs->state->lenchartoken) { @@ -557,7 +557,7 @@ SpecialTags(TParser * prs) } static void -SpecialFURL(TParser * prs) +SpecialFURL(TParser *prs) { prs->wanthost = true; prs->state->posbyte -= prs->state->lenbytetoken; @@ -565,14 +565,14 @@ SpecialFURL(TParser * prs) } static void -SpecialHyphen(TParser * prs) +SpecialHyphen(TParser *prs) { prs->state->posbyte -= prs->state->lenbytetoken; prs->state->poschar -= prs->state->lenchartoken; } static void -SpecialVerVersion(TParser * prs) +SpecialVerVersion(TParser *prs) { prs->state->posbyte -= prs->state->lenbytetoken; prs->state->poschar -= prs->state->lenchartoken; @@ -581,7 +581,7 @@ SpecialVerVersion(TParser * prs) } static int -p_isstophost(TParser * prs) +p_isstophost(TParser *prs) { if (prs->wanthost) { @@ -592,13 +592,13 @@ p_isstophost(TParser * prs) } static int -p_isignore(TParser * prs) +p_isignore(TParser *prs) { return (prs->ignore) ? 1 : 0; } static int -p_ishost(TParser * prs) +p_ishost(TParser *prs) { TParser *tmpprs = TParserInit(prs->str + prs->state->posbyte, prs->lenstr - prs->state->posbyte); int res = 0; @@ -618,7 +618,7 @@ p_ishost(TParser * prs) } static int -p_isURLPath(TParser * prs) +p_isURLPath(TParser *prs) { TParser *tmpprs = TParserInit(prs->str + prs->state->posbyte, prs->lenstr - prs->state->posbyte); int res = 0; @@ -1244,7 +1244,7 @@ typedef struct #ifdef WPARSER_TRACE const char *state_name; /* only for debug printout */ #endif -} TParserStateAction; +} TParserStateAction; #ifdef WPARSER_TRACE #define TPARSERSTATEACTION(state) \ @@ -1338,7 +1338,7 @@ static const TParserStateAction Actions[] = { static bool -TParserGet(TParser * prs) +TParserGet(TParser *prs) { const TParserStateActionItem *item = NULL; @@ -1566,10 +1566,10 @@ typedef struct { HeadlineWordEntry *words; int len; -} hlCheck; +} hlCheck; static bool -checkcondition_HL(void *checkval, QueryOperand * val) +checkcondition_HL(void *checkval, QueryOperand *val) { int i; @@ -1583,7 +1583,7 @@ checkcondition_HL(void *checkval, QueryOperand * val) static bool -hlCover(HeadlineParsedText * prs, TSQuery query, int *p, int *q) +hlCover(HeadlineParsedText *prs, TSQuery query, int *p, int *q) { int i, j; 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; diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c index a22ad5a0e08..35f32ee2383 100644 --- a/src/bin/pg_dump/common.c +++ b/src/bin/pg_dump/common.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.100 2007/11/15 21:14:41 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.101 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -916,7 +916,7 @@ strInArray(const char *pattern, char **arr, int arr_size) */ void -simple_oid_list_append(SimpleOidList * list, Oid val) +simple_oid_list_append(SimpleOidList *list, Oid val) { SimpleOidListCell *cell; @@ -932,7 +932,7 @@ simple_oid_list_append(SimpleOidList * list, Oid val) } void -simple_string_list_append(SimpleStringList * list, const char *val) +simple_string_list_append(SimpleStringList *list, const char *val) { SimpleStringListCell *cell; @@ -950,7 +950,7 @@ simple_string_list_append(SimpleStringList * list, const char *val) } bool -simple_oid_list_member(SimpleOidList * list, Oid val) +simple_oid_list_member(SimpleOidList *list, Oid val) { SimpleOidListCell *cell; @@ -963,7 +963,7 @@ simple_oid_list_member(SimpleOidList * list, Oid val) } bool -simple_string_list_member(SimpleStringList * list, const char *val) +simple_string_list_member(SimpleStringList *list, const char *val) { SimpleStringListCell *cell; diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 2429c4431c7..207e6952070 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -12,7 +12,7 @@ * by PostgreSQL * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.476 2007/11/15 21:14:41 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.477 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -120,10 +120,10 @@ static int disable_dollar_quoting = 0; static void help(const char *progname); -static void expand_schema_name_patterns(SimpleStringList * patterns, - SimpleOidList * oids); -static void expand_table_name_patterns(SimpleStringList * patterns, - SimpleOidList * oids); +static void expand_schema_name_patterns(SimpleStringList *patterns, + SimpleOidList *oids); +static void expand_table_name_patterns(SimpleStringList *patterns, + SimpleOidList *oids); static NamespaceInfo *findNamespace(Oid nsoid, Oid objoid); static void dumpTableData(Archive *fout, TableDataInfo *tdinfo); static void dumpComment(Archive *fout, const char *target, @@ -145,7 +145,7 @@ static void dumpFunc(Archive *fout, FuncInfo *finfo); static void dumpCast(Archive *fout, CastInfo *cast); static void dumpOpr(Archive *fout, OprInfo *oprinfo); static void dumpOpclass(Archive *fout, OpclassInfo *opcinfo); -static void dumpOpfamily(Archive *fout, OpfamilyInfo * opfinfo); +static void dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo); static void dumpConversion(Archive *fout, ConvInfo *convinfo); static void dumpRule(Archive *fout, RuleInfo *rinfo); static void dumpAgg(Archive *fout, AggInfo *agginfo); @@ -157,10 +157,10 @@ static void dumpSequence(Archive *fout, TableInfo *tbinfo); static void dumpIndex(Archive *fout, IndxInfo *indxinfo); static void dumpConstraint(Archive *fout, ConstraintInfo *coninfo); static void dumpTableConstraintComment(Archive *fout, ConstraintInfo *coninfo); -static void dumpTSParser(Archive *fout, TSParserInfo * prsinfo); -static void dumpTSDictionary(Archive *fout, TSDictInfo * dictinfo); -static void dumpTSTemplate(Archive *fout, TSTemplateInfo * tmplinfo); -static void dumpTSConfig(Archive *fout, TSConfigInfo * cfginfo); +static void dumpTSParser(Archive *fout, TSParserInfo *prsinfo); +static void dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo); +static void dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo); +static void dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo); static void dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId, const char *type, const char *name, @@ -795,7 +795,7 @@ exit_nicely(void) * and append them to the given OID list. */ static void -expand_schema_name_patterns(SimpleStringList * patterns, SimpleOidList * oids) +expand_schema_name_patterns(SimpleStringList *patterns, SimpleOidList *oids) { PQExpBuffer query; PGresult *res; @@ -846,7 +846,7 @@ expand_schema_name_patterns(SimpleStringList * patterns, SimpleOidList * oids) * and append them to the given OID list. */ static void -expand_table_name_patterns(SimpleStringList * patterns, SimpleOidList * oids) +expand_table_name_patterns(SimpleStringList *patterns, SimpleOidList *oids) { PQExpBuffer query; PGresult *res; @@ -7590,7 +7590,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo) * write out a single operator family definition */ static void -dumpOpfamily(Archive *fout, OpfamilyInfo * opfinfo) +dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo) { PQExpBuffer query; PQExpBuffer q; @@ -8219,7 +8219,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo) * write out a single text search parser */ static void -dumpTSParser(Archive *fout, TSParserInfo * prsinfo) +dumpTSParser(Archive *fout, TSParserInfo *prsinfo) { PQExpBuffer q; PQExpBuffer delq; @@ -8283,7 +8283,7 @@ dumpTSParser(Archive *fout, TSParserInfo * prsinfo) * write out a single text search dictionary */ static void -dumpTSDictionary(Archive *fout, TSDictInfo * dictinfo) +dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo) { PQExpBuffer q; PQExpBuffer delq; @@ -8373,7 +8373,7 @@ dumpTSDictionary(Archive *fout, TSDictInfo * dictinfo) * write out a single text search template */ static void -dumpTSTemplate(Archive *fout, TSTemplateInfo * tmplinfo) +dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo) { PQExpBuffer q; PQExpBuffer delq; @@ -8431,7 +8431,7 @@ dumpTSTemplate(Archive *fout, TSTemplateInfo * tmplinfo) * write out a single text search configuration */ static void -dumpTSConfig(Archive *fout, TSConfigInfo * cfginfo) +dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo) { PQExpBuffer q; PQExpBuffer delq; diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h index 8f33a15d4b4..95f9403306c 100644 --- a/src/bin/pg_dump/pg_dump.h +++ b/src/bin/pg_dump/pg_dump.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.h,v 1.137 2007/11/15 21:14:42 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.h,v 1.138 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -69,25 +69,25 @@ typedef struct SimpleOidListCell { struct SimpleOidListCell *next; Oid val; -} SimpleOidListCell; +} SimpleOidListCell; typedef struct SimpleOidList { SimpleOidListCell *head; SimpleOidListCell *tail; -} SimpleOidList; +} SimpleOidList; typedef struct SimpleStringListCell { struct SimpleStringListCell *next; char val[1]; /* VARIABLE LENGTH FIELD */ -} SimpleStringListCell; +} SimpleStringListCell; typedef struct SimpleStringList { SimpleStringListCell *head; SimpleStringListCell *tail; -} SimpleStringList; +} SimpleStringList; /* * The data structures used to store system catalog information. Every @@ -219,7 +219,7 @@ typedef struct _opfamilyInfo { DumpableObject dobj; char *rolname; -} OpfamilyInfo; +} OpfamilyInfo; typedef struct _convInfo { @@ -391,7 +391,7 @@ typedef struct _prsInfo Oid prsend; Oid prsheadline; Oid prslextype; -} TSParserInfo; +} TSParserInfo; typedef struct _dictInfo { @@ -399,21 +399,21 @@ typedef struct _dictInfo char *rolname; Oid dicttemplate; char *dictinitoption; -} TSDictInfo; +} TSDictInfo; typedef struct _tmplInfo { DumpableObject dobj; Oid tmplinit; Oid tmpllexize; -} TSTemplateInfo; +} TSTemplateInfo; typedef struct _cfgInfo { DumpableObject dobj; char *rolname; Oid cfgparser; -} TSConfigInfo; +} TSConfigInfo; /* global decls */ extern bool force_quotes; /* double-quotes for identifiers flag */ @@ -454,10 +454,10 @@ extern TypeInfo *findTypeByOid(Oid oid); extern FuncInfo *findFuncByOid(Oid oid); extern OprInfo *findOprByOid(Oid oid); -extern void simple_oid_list_append(SimpleOidList * list, Oid val); -extern void simple_string_list_append(SimpleStringList * list, const char *val); -extern bool simple_oid_list_member(SimpleOidList * list, Oid val); -extern bool simple_string_list_member(SimpleStringList * list, const char *val); +extern void simple_oid_list_append(SimpleOidList *list, Oid val); +extern void simple_string_list_append(SimpleStringList *list, const char *val); +extern bool simple_oid_list_member(SimpleOidList *list, Oid val); +extern bool simple_string_list_member(SimpleStringList *list, const char *val); extern char *pg_strdup(const char *string); extern void *pg_malloc(size_t size); diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 84b6080c720..f49134c6c6e 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -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/include/access/htup.h,v 1.96 2007/11/15 21:14:42 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.97 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -714,7 +714,7 @@ typedef struct xl_heap_freeze BlockNumber block; TransactionId cutoff_xid; /* TUPLE OFFSET NUMBERS FOLLOW AT THE END */ -} xl_heap_freeze; +} xl_heap_freeze; #define SizeOfHeapFreeze (offsetof(xl_heap_freeze, cutoff_xid) + sizeof(TransactionId)) diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index de6f53e0533..14f2c55e4dd 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.85 2007/11/15 21:14:42 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.86 2007/11/15 22:25:17 momjian Exp $ */ #ifndef XLOG_H #define XLOG_H @@ -182,7 +182,7 @@ typedef struct CheckpointStatsData int ckpt_segs_added; /* # of new xlog segments created */ int ckpt_segs_removed; /* # of xlog segments deleted */ int ckpt_segs_recycled; /* # of xlog segments recycled */ -} CheckpointStatsData; +} CheckpointStatsData; extern CheckpointStatsData CheckpointStats; diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index 5f2399ae597..ac53fedd486 100644 --- a/src/include/bootstrap/bootstrap.h +++ b/src/include/bootstrap/bootstrap.h @@ -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/include/bootstrap/bootstrap.h,v 1.48 2007/11/15 21:14:42 momjian Exp $ + * $PostgreSQL: pgsql/src/include/bootstrap/bootstrap.h,v 1.49 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -71,6 +71,6 @@ typedef enum StartupProcess, BgWriterProcess, WalWriterProcess -} AuxProcType; +} AuxProcType; #endif /* BOOTSTRAP_H */ diff --git a/src/include/catalog/namespace.h b/src/include/catalog/namespace.h index 8da3c9968e8..c2c3f7512a4 100644 --- a/src/include/catalog/namespace.h +++ b/src/include/catalog/namespace.h @@ -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/include/catalog/namespace.h,v 1.50 2007/11/15 21:14:42 momjian Exp $ + * $PostgreSQL: pgsql/src/include/catalog/namespace.h,v 1.51 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,7 +40,7 @@ typedef struct OverrideSearchPath List *schemas; /* OIDs of explicitly named schemas */ bool addCatalog; /* implicitly prepend pg_catalog? */ bool addTemp; /* implicitly prepend temp schema? */ -} OverrideSearchPath; +} OverrideSearchPath; extern Oid RangeVarGetRelid(const RangeVar *relation, bool failOK); @@ -99,7 +99,7 @@ extern Oid GetTempToastNamespace(void); extern void ResetTempTableNamespace(void); extern OverrideSearchPath *GetOverrideSearchPath(MemoryContext context); -extern void PushOverrideSearchPath(OverrideSearchPath * newpath); +extern void PushOverrideSearchPath(OverrideSearchPath *newpath); extern void PopOverrideSearchPath(void); extern Oid FindConversionByName(List *conname); diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h index ebf8abe92a4..99621d3b26e 100644 --- a/src/include/commands/defrem.h +++ b/src/include/commands/defrem.h @@ -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/include/commands/defrem.h,v 1.85 2007/11/15 21:14:43 momjian Exp $ + * $PostgreSQL: pgsql/src/include/commands/defrem.h,v 1.86 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,10 +79,10 @@ extern void AlterAggregateOwner(List *name, List *args, Oid newOwnerId); /* commands/opclasscmds.c */ extern void DefineOpClass(CreateOpClassStmt *stmt); -extern void DefineOpFamily(CreateOpFamilyStmt * stmt); -extern void AlterOpFamily(AlterOpFamilyStmt * stmt); +extern void DefineOpFamily(CreateOpFamilyStmt *stmt); +extern void AlterOpFamily(AlterOpFamilyStmt *stmt); extern void RemoveOpClass(RemoveOpClassStmt *stmt); -extern void RemoveOpFamily(RemoveOpFamilyStmt * stmt); +extern void RemoveOpFamily(RemoveOpFamilyStmt *stmt); extern void RemoveOpClassById(Oid opclassOid); extern void RemoveOpFamilyById(Oid opfamilyOid); extern void RemoveAmOpEntryById(Oid entryOid); @@ -104,7 +104,7 @@ extern void RenameTSDictionary(List *oldname, const char *newname); extern void RemoveTSDictionary(List *names, DropBehavior behavior, bool missing_ok); extern void RemoveTSDictionaryById(Oid dictId); -extern void AlterTSDictionary(AlterTSDictionaryStmt * stmt); +extern void AlterTSDictionary(AlterTSDictionaryStmt *stmt); extern void AlterTSDictionaryOwner(List *name, Oid newOwnerId); extern void DefineTSTemplate(List *names, List *parameters); @@ -118,7 +118,7 @@ extern void RenameTSConfiguration(List *oldname, const char *newname); extern void RemoveTSConfiguration(List *names, DropBehavior behavior, bool missing_ok); extern void RemoveTSConfigurationById(Oid cfgId); -extern void AlterTSConfiguration(AlterTSConfigurationStmt * stmt); +extern void AlterTSConfiguration(AlterTSConfigurationStmt *stmt); extern void AlterTSConfigurationOwner(List *name, Oid newOwnerId); extern text *serialize_deflist(List *deflist); diff --git a/src/include/commands/discard.h b/src/include/commands/discard.h index 4549accebe6..0d025f6cb39 100644 --- a/src/include/commands/discard.h +++ b/src/include/commands/discard.h @@ -6,7 +6,7 @@ * * Copyright (c) 1996-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/commands/discard.h,v 1.2 2007/11/15 21:14:43 momjian Exp $ + * $PostgreSQL: pgsql/src/include/commands/discard.h,v 1.3 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,6 +15,6 @@ #include "nodes/parsenodes.h" -extern void DiscardCommand(DiscardStmt * stmt, bool isTopLevel); +extern void DiscardCommand(DiscardStmt *stmt, bool isTopLevel); #endif /* DISCARD_H */ diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h index b20b642064b..2460a3e8166 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.33 2007/11/15 21:14:43 momjian Exp $ + * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.34 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,7 +38,7 @@ extern void ExplainOneUtility(Node *utilityStmt, ExplainStmt *stmt, ParamListInfo params, TupOutputState *tstate); -extern void ExplainOnePlan(PlannedStmt * plannedstmt, ParamListInfo params, +extern void ExplainOnePlan(PlannedStmt *plannedstmt, ParamListInfo params, ExplainStmt *stmt, TupOutputState *tstate); #endif /* EXPLAIN_H */ diff --git a/src/include/commands/portalcmds.h b/src/include/commands/portalcmds.h index 502caafbd56..54f6a4fe692 100644 --- a/src/include/commands/portalcmds.h +++ b/src/include/commands/portalcmds.h @@ -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/include/commands/portalcmds.h,v 1.24 2007/11/15 21:14:43 momjian Exp $ + * $PostgreSQL: pgsql/src/include/commands/portalcmds.h,v 1.25 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ #include "utils/portal.h" -extern void PerformCursorOpen(PlannedStmt * stmt, ParamListInfo params, +extern void PerformCursorOpen(PlannedStmt *stmt, ParamListInfo params, const char *queryString, bool isTopLevel); extern void PerformPortalFetch(FetchStmt *stmt, DestReceiver *dest, diff --git a/src/include/commands/typecmds.h b/src/include/commands/typecmds.h index d316b82f500..9f791c5b0a6 100644 --- a/src/include/commands/typecmds.h +++ b/src/include/commands/typecmds.h @@ -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/include/commands/typecmds.h,v 1.20 2007/11/15 21:14:43 momjian Exp $ + * $PostgreSQL: pgsql/src/include/commands/typecmds.h,v 1.21 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ extern void RemoveType(List *names, DropBehavior behavior, bool missing_ok); extern void RemoveTypeById(Oid typeOid); extern void DefineDomain(CreateDomainStmt *stmt); extern void RemoveDomain(List *names, DropBehavior behavior, bool missing_ok); -extern void DefineEnum(CreateEnumStmt * stmt); +extern void DefineEnum(CreateEnumStmt *stmt); extern Oid DefineCompositeType(const RangeVar *typevar, List *coldeflist); extern void AlterDomainDefault(List *names, Node *defaultRaw); diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index f3dff5d8a54..1bfb27e2c13 100644 --- a/src/include/executor/execdesc.h +++ b/src/include/executor/execdesc.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/execdesc.h,v 1.35 2007/11/15 21:14:43 momjian Exp $ + * $PostgreSQL: pgsql/src/include/executor/execdesc.h,v 1.36 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -50,7 +50,7 @@ typedef struct QueryDesc } QueryDesc; /* in pquery.c */ -extern QueryDesc *CreateQueryDesc(PlannedStmt * plannedstmt, +extern QueryDesc *CreateQueryDesc(PlannedStmt *plannedstmt, Snapshot snapshot, Snapshot crosscheck_snapshot, DestReceiver *dest, diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 47399bf047e..08b97e3adfc 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -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/include/executor/executor.h,v 1.143 2007/11/15 21:14:43 momjian Exp $ + * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.144 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -73,7 +73,7 @@ extern bool ExecMayReturnRawTuples(PlanState *node); /* * prototypes from functions in execCurrent.c */ -extern bool execCurrentOf(CurrentOfExpr * cexpr, +extern bool execCurrentOf(CurrentOfExpr *cexpr, ExprContext *econtext, Oid table_oid, ItemPointer current_tid); diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index 4155055e101..5edb9d6dd8a 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.76 2007/11/15 21:14:43 momjian Exp $ + * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.77 2007/11/15 22:25:17 momjian Exp $ * * NOTES * This is used both by the backend and by libpq, but should not be @@ -313,7 +313,7 @@ typedef struct uint32 utf1; /* UTF-8 code 1 */ uint32 utf2; /* UTF-8 code 2 */ uint32 code; /* local code */ -} pg_utf_to_local_combined; +} pg_utf_to_local_combined; /* * local code to UTF-8 conversion map(combined characters) @@ -323,7 +323,7 @@ typedef struct uint32 code; /* local code */ uint32 utf1; /* UTF-8 code 1 */ uint32 utf2; /* UTF-8 code 2 */ -} pg_local_to_utf_combined; +} pg_local_to_utf_combined; /* @@ -387,11 +387,11 @@ extern unsigned short BIG5toCNS(unsigned short big5, unsigned char *lc); extern unsigned short CNStoBIG5(unsigned short cns, unsigned char lc); extern void LocalToUtf(const unsigned char *iso, unsigned char *utf, - const pg_local_to_utf *map, const pg_local_to_utf_combined * cmap, + const pg_local_to_utf *map, const pg_local_to_utf_combined *cmap, int size1, int size2, int encoding, int len); extern void UtfToLocal(const unsigned char *utf, unsigned char *iso, - const pg_utf_to_local *map, const pg_utf_to_local_combined * cmap, + const pg_utf_to_local *map, const pg_utf_to_local_combined *cmap, int size1, int size2, int encoding, int len); extern bool pg_verifymbstr(const char *mbstr, int len, bool noError); diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 24f472de91c..ca0e9c8fa78 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -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/include/nodes/execnodes.h,v 1.180 2007/11/15 21:14:44 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.181 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -658,7 +658,7 @@ typedef struct CoerceViaIOState FmgrInfo outfunc; /* lookup info for source output function */ FmgrInfo infunc; /* lookup info for result input function */ Oid intypioparam; /* argument needed for input function */ -} CoerceViaIOState; +} CoerceViaIOState; /* ---------------- * ArrayCoerceExprState node @@ -672,7 +672,7 @@ typedef struct ArrayCoerceExprState FmgrInfo elemfunc; /* lookup info for element coercion function */ /* use struct pointer to avoid including array.h here */ struct ArrayMapState *amstate; /* workspace for array_map */ -} ArrayCoerceExprState; +} ArrayCoerceExprState; /* ---------------- * ConvertRowtypeExprState node @@ -784,7 +784,7 @@ typedef struct XmlExprState List *named_args; /* ExprStates for named arguments */ FmgrInfo *named_outfuncs; /* array of output fns for named arguments */ List *args; /* ExprStates for other arguments */ -} XmlExprState; +} XmlExprState; /* ---------------- * NullTestState node diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 3e7287166ef..51d760ef564 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -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/include/nodes/parsenodes.h,v 1.355 2007/11/15 21:14:44 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.356 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,14 +34,14 @@ typedef enum SortByDir SORTBY_ASC, SORTBY_DESC, SORTBY_USING /* not allowed in CREATE INDEX ... */ -} SortByDir; +} SortByDir; typedef enum SortByNulls { SORTBY_NULLS_DEFAULT, SORTBY_NULLS_FIRST, SORTBY_NULLS_LAST -} SortByNulls; +} SortByNulls; /* @@ -464,7 +464,7 @@ typedef struct XmlSerialize XmlOptionType xmloption; Node *expr; TypeName *typename; -} XmlSerialize; +} XmlSerialize; /**************************************************************************** @@ -1065,7 +1065,7 @@ typedef enum VAR_SET_MULTI, /* special case for SET TRANSACTION ... */ VAR_RESET, /* RESET var */ VAR_RESET_ALL /* RESET ALL */ -} VariableSetKind; +} VariableSetKind; typedef struct VariableSetStmt { @@ -1397,7 +1397,7 @@ typedef struct CreateOpFamilyStmt NodeTag type; List *opfamilyname; /* qualified name (list of Value strings) */ char *amname; /* name of index AM opfamily is for */ -} CreateOpFamilyStmt; +} CreateOpFamilyStmt; /* ---------------------- * Alter Operator Family Statement @@ -1410,7 +1410,7 @@ typedef struct AlterOpFamilyStmt char *amname; /* name of index AM opfamily is for */ bool isDrop; /* ADD or DROP the items? */ List *items; /* List of CreateOpClassItem nodes */ -} AlterOpFamilyStmt; +} AlterOpFamilyStmt; /* ---------------------- * Drop Table|Sequence|View|Index|Type|Domain|Conversion|Schema Statement @@ -1624,7 +1624,7 @@ typedef struct RemoveOpFamilyStmt char *amname; /* name of index AM opfamily is for */ DropBehavior behavior; /* RESTRICT or CASCADE behavior */ bool missing_ok; /* skip error if missing? */ -} RemoveOpFamilyStmt; +} RemoveOpFamilyStmt; /* ---------------------- * Alter Object Rename Statement @@ -1765,7 +1765,7 @@ typedef struct CreateEnumStmt NodeTag type; List *typename; /* qualified name (list of Value strings) */ List *vals; /* enum values (list of Value strings) */ -} CreateEnumStmt; +} CreateEnumStmt; /* ---------------------- @@ -1892,13 +1892,13 @@ typedef enum DiscardMode DISCARD_ALL, DISCARD_PLANS, DISCARD_TEMP -} DiscardMode; +} DiscardMode; typedef struct DiscardStmt { NodeTag type; DiscardMode target; -} DiscardStmt; +} DiscardStmt; /* ---------------------- * LOCK Statement @@ -2044,7 +2044,7 @@ typedef struct AlterTSDictionaryStmt NodeTag type; List *dictname; /* qualified name (list of Value strings) */ List *options; /* List of DefElem nodes */ -} AlterTSDictionaryStmt; +} AlterTSDictionaryStmt; /* * TS Configuration stmts: DefineStmt, RenameStmt and DropStmt are default @@ -2063,6 +2063,6 @@ typedef struct AlterTSConfigurationStmt bool override; /* if true - remove old variant */ bool replace; /* if true - replace dictionary by another */ bool missing_ok; /* for DROP - skip error if missing? */ -} AlterTSConfigurationStmt; +} AlterTSConfigurationStmt; #endif /* PARSENODES_H */ diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 6dab3cda689..7a283ec646a 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -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/include/nodes/plannodes.h,v 1.97 2007/11/15 21:14:44 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/plannodes.h,v 1.98 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -73,7 +73,7 @@ typedef struct PlannedStmt List *relationOids; /* OIDs of relations the plan depends on */ int nParamExec; /* number of PARAM_EXEC Params used */ -} PlannedStmt; +} PlannedStmt; /* macro for fetching the Plan associated with a SubPlan node */ #define exec_subplan_get_plan(plannedstmt, subplan) \ diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index 7cfa057d35e..4b940791a28 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.134 2007/11/15 21:14:44 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.135 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -90,7 +90,7 @@ typedef struct IntoClause List *options; /* options from WITH clause */ OnCommitAction onCommit; /* what do we do at COMMIT? */ char *tableSpaceName; /* table space to use, or NULL */ -} IntoClause; +} IntoClause; /* ---------------------------------------------------------------- @@ -566,7 +566,7 @@ typedef struct CoerceViaIO Oid resulttype; /* output type of coercion */ /* output typmod is not stored, but is presumed -1 */ CoercionForm coerceformat; /* how to display this node */ -} CoerceViaIO; +} CoerceViaIO; /* ---------------- * ArrayCoerceExpr @@ -589,7 +589,7 @@ typedef struct ArrayCoerceExpr int32 resulttypmod; /* output typmod (also element typmod) */ bool isExplicit; /* conversion semantics flag to pass to func */ CoercionForm coerceformat; /* how to display this node */ -} ArrayCoerceExpr; +} ArrayCoerceExpr; /* ---------------- * ConvertRowtypeExpr @@ -792,13 +792,13 @@ typedef enum XmlExprOp IS_XMLROOT, /* XMLROOT(xml, version, standalone) */ IS_XMLSERIALIZE, /* XMLSERIALIZE(is_document, xmlval) */ IS_DOCUMENT /* xmlval IS DOCUMENT */ -} XmlExprOp; +} XmlExprOp; typedef enum { XMLOPTION_DOCUMENT, XMLOPTION_CONTENT -} XmlOptionType; +} XmlOptionType; typedef struct XmlExpr { @@ -811,7 +811,7 @@ typedef struct XmlExpr XmlOptionType xmloption; /* DOCUMENT or CONTENT */ Oid type; /* target type for XMLSERIALIZE */ int32 typmod; -} XmlExpr; +} XmlExpr; /* * NullIfExpr - a NULLIF expression @@ -933,7 +933,7 @@ typedef struct CurrentOfExpr Index cvarno; /* RT index of target relation */ char *cursor_name; /* name of referenced cursor, or NULL */ int cursor_param; /* refcursor parameter number, or 0 */ -} CurrentOfExpr; +} CurrentOfExpr; /*-------------------- * TargetEntry - diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 2a33b82bd36..2dce223d3a7 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -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/include/nodes/relation.h,v 1.149 2007/11/15 21:14:44 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.150 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,7 +75,7 @@ typedef struct PlannerGlobal List *relationOids; /* OIDs of relations the plan depends on */ bool transientPlan; /* redo plan when TransactionXmin changes? */ -} PlannerGlobal; +} PlannerGlobal; /* macro for fetching the Plan associated with a SubPlan node */ #define planner_subplan_get_plan(root, subplan) \ @@ -477,7 +477,7 @@ typedef struct EquivalenceClass bool ec_broken; /* failed to generate needed clauses? */ Index ec_sortref; /* originating sortclause label, or 0 */ struct EquivalenceClass *ec_merged; /* set if merged into another EC */ -} EquivalenceClass; +} EquivalenceClass; /* * EquivalenceMember - one member expression of an EquivalenceClass @@ -503,7 +503,7 @@ typedef struct EquivalenceMember bool em_is_const; /* expression is pseudoconstant? */ bool em_is_child; /* derived version for a child relation? */ Oid em_datatype; /* the "nominal type" used by the opfamily */ -} EquivalenceMember; +} EquivalenceMember; /* * PathKeys @@ -530,7 +530,7 @@ typedef struct PathKey Oid pk_opfamily; /* btree opfamily defining the ordering */ int pk_strategy; /* sort direction (ASC or DESC) */ bool pk_nulls_first; /* do NULLs come before normal values? */ -} PathKey; +} PathKey; /* * Type "Path" is used as-is for sequential-scan paths. For other @@ -995,7 +995,7 @@ typedef struct MergeScanSelCache /* Results */ Selectivity leftscansel; /* scan fraction for clause left side */ Selectivity rightscansel; /* scan fraction for clause right side */ -} MergeScanSelCache; +} MergeScanSelCache; /* * Inner indexscan info. diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index 7d4607d9599..f1fadae461c 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -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/include/optimizer/paths.h,v 1.101 2007/11/15 21:14:44 momjian Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/paths.h,v 1.102 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,8 +62,8 @@ extern List *group_clauses_by_indexkey(IndexOptInfo *index, Relids outer_relids, SaOpControl saop_control, bool *found_clause); -extern bool eclass_matches_any_index(EquivalenceClass * ec, - EquivalenceMember * em, +extern bool eclass_matches_any_index(EquivalenceClass *ec, + EquivalenceMember *em, RelOptInfo *rel); extern bool match_index_to_operand(Node *operand, int indexcol, IndexOptInfo *index); @@ -134,7 +134,7 @@ extern bool have_relevant_eclass_joinclause(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2); extern bool has_relevant_eclass_joinclause(PlannerInfo *root, RelOptInfo *rel1); -extern bool eclass_useful_for_merging(EquivalenceClass * eclass, +extern bool eclass_useful_for_merging(EquivalenceClass *eclass, RelOptInfo *rel); /* diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 1b30badf71c..2f895118814 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -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/include/optimizer/planmain.h,v 1.104 2007/11/15 21:14:44 momjian Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/planmain.h,v 1.105 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -93,10 +93,10 @@ extern RestrictInfo *build_implied_join_equality(Oid opno, /* * prototypes for plan/setrefs.c */ -extern Plan *set_plan_references(PlannerGlobal * glob, +extern Plan *set_plan_references(PlannerGlobal *glob, Plan *plan, List *rtable); -extern List *set_returning_clause_references(PlannerGlobal * glob, +extern List *set_returning_clause_references(PlannerGlobal *glob, List *rlist, Plan *topplan, Index resultRelation); diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h index 6712de93f3b..d04945b6cc5 100644 --- a/src/include/optimizer/planner.h +++ b/src/include/optimizer/planner.h @@ -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/include/optimizer/planner.h,v 1.42 2007/11/15 21:14:44 momjian Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/planner.h,v 1.43 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,7 +29,7 @@ extern PlannedStmt *planner(Query *parse, int cursorOptions, ParamListInfo boundParams); extern PlannedStmt *standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams); -extern Plan *subquery_planner(PlannerGlobal * glob, Query *parse, +extern Plan *subquery_planner(PlannerGlobal *glob, Query *parse, Index level, double tuple_fraction, PlannerInfo **subroot); diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index 479e1d85a35..73a787e6f5d 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -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/include/parser/parse_coerce.h,v 1.72 2007/11/15 21:14:44 momjian Exp $ + * $PostgreSQL: pgsql/src/include/parser/parse_coerce.h,v 1.73 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,7 +42,7 @@ typedef enum CoercionPathType COERCION_PATH_RELABELTYPE, /* binary-compatible cast, no function */ COERCION_PATH_ARRAYCOERCE, /* need an ArrayCoerceExpr node */ COERCION_PATH_COERCEVIAIO /* need a CoerceViaIO node */ -} CoercionPathType; +} CoercionPathType; extern bool IsBinaryCoercible(Oid srctype, Oid targettype); diff --git a/src/include/pgstat.h b/src/include/pgstat.h index 2340ed69378..12b91a5d0df 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -5,7 +5,7 @@ * * Copyright (c) 2001-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/pgstat.h,v 1.69 2007/11/15 21:14:42 momjian Exp $ + * $PostgreSQL: pgsql/src/include/pgstat.h,v 1.70 2007/11/15 22:25:16 momjian Exp $ * ---------- */ #ifndef PGSTAT_H @@ -78,7 +78,7 @@ typedef struct PgStat_TableCounts PgStat_Counter t_blocks_fetched; PgStat_Counter t_blocks_hit; -} PgStat_TableCounts; +} PgStat_TableCounts; /* ------------------------------------------------------------ @@ -108,7 +108,7 @@ typedef struct PgStat_TableStatus bool t_shared; /* is it a shared catalog? */ struct PgStat_TableXactStatus *trans; /* lowest subxact's counts */ PgStat_TableCounts t_counts; /* event counts to be sent */ -} PgStat_TableStatus; +} PgStat_TableStatus; /* ---------- * PgStat_TableXactStatus Per-table, per-subtransaction status @@ -124,7 +124,7 @@ typedef struct PgStat_TableXactStatus PgStat_TableStatus *parent; /* per-table status */ /* structs of same subxact level are linked here: */ struct PgStat_TableXactStatus *next; /* next of same subxact */ -} PgStat_TableXactStatus; +} PgStat_TableXactStatus; /* ------------------------------------------------------------ @@ -296,7 +296,7 @@ typedef struct PgStat_MsgBgWriter PgStat_Counter m_maxwritten_clean; PgStat_Counter m_buf_written_backend; PgStat_Counter m_buf_alloc; -} PgStat_MsgBgWriter; +} PgStat_MsgBgWriter; /* ---------- @@ -398,7 +398,7 @@ typedef struct PgStat_GlobalStats PgStat_Counter maxwritten_clean; PgStat_Counter buf_written_backend; PgStat_Counter buf_alloc; -} PgStat_GlobalStats; +} PgStat_GlobalStats; /* ---------- diff --git a/src/include/postgres.h b/src/include/postgres.h index c8d541698d8..5f65b52b359 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/postgres.h,v 1.86 2007/11/15 21:14:42 momjian Exp $ + * $PostgreSQL: pgsql/src/include/postgres.h,v 1.87 2007/11/15 22:25:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -95,20 +95,20 @@ typedef union uint32 va_rawsize; /* Original data size (excludes header) */ char va_data[1]; /* Compressed data */ } va_compressed; -} varattrib_4b; +} varattrib_4b; typedef struct { uint8 va_header; char va_data[1]; /* Data begins here */ -} varattrib_1b; +} varattrib_1b; typedef struct { uint8 va_header; /* Always 0x80 or 0x01 */ uint8 va_len_1be; /* Physical length of datum */ char va_data[1]; /* Data (for now always a TOAST pointer) */ -} varattrib_1b_e; +} varattrib_1b_e; /* * Bit layouts for varlena headers on big-endian machines: diff --git a/src/include/postmaster/syslogger.h b/src/include/postmaster/syslogger.h index e17611d2699..2dd7392d866 100644 --- a/src/include/postmaster/syslogger.h +++ b/src/include/postmaster/syslogger.h @@ -5,7 +5,7 @@ * * Copyright (c) 2004-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/postmaster/syslogger.h,v 1.12 2007/11/15 21:14:44 momjian Exp $ + * $PostgreSQL: pgsql/src/include/postmaster/syslogger.h,v 1.13 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,13 +49,13 @@ typedef struct char is_last; /* last chunk of message? 't' or 'f' ('T' or * 'F' for CSV case) */ char data[1]; /* data payload starts here */ -} PipeProtoHeader; +} PipeProtoHeader; typedef union { PipeProtoHeader proto; char filler[PIPE_CHUNK_SIZE]; -} PipeProtoChunk; +} PipeProtoChunk; #define PIPE_HEADER_SIZE offsetof(PipeProtoHeader, data) #define PIPE_MAX_PAYLOAD ((int) (PIPE_CHUNK_SIZE - PIPE_HEADER_SIZE)) diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 5e9d0896fbe..16f6b6dbe62 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -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/include/storage/bufmgr.h,v 1.109 2007/11/15 21:14:44 momjian Exp $ + * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.110 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,7 @@ typedef enum BufferAccessStrategyType BAS_BULKREAD, /* Large read-only scan (hint bit updates are * ok) */ BAS_VACUUM /* VACUUM */ -} BufferAccessStrategyType; +} BufferAccessStrategyType; /* in globals.c ... this duplicates miscadmin.h */ extern PGDLLIMPORT int NBuffers; diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 60989c8e3e5..52f29656f0a 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -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/include/storage/lock.h,v 1.109 2007/11/15 21:14:44 momjian Exp $ + * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.110 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,7 +62,7 @@ typedef struct BackendId backendId; /* determined at backend startup */ LocalTransactionId localTransactionId; /* backend-local transaction * id */ -} VirtualTransactionId; +} VirtualTransactionId; #define InvalidLocalTransactionId 0 #define LocalTransactionIdIsValid(lxid) ((lxid) != InvalidLocalTransactionId) @@ -446,7 +446,7 @@ typedef enum DS_HARD_DEADLOCK, /* deadlock, no way out but ERROR */ DS_BLOCKED_BY_AUTOVACUUM /* no deadlock; queue blocked by autovacuum * worker */ -} DeadLockState; +} DeadLockState; /* diff --git a/src/include/tsearch/dicts/regis.h b/src/include/tsearch/dicts/regis.h index 47fc3ec76e3..2bc857bbd95 100644 --- a/src/include/tsearch/dicts/regis.h +++ b/src/include/tsearch/dicts/regis.h @@ -6,7 +6,7 @@ * * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/tsearch/dicts/regis.h,v 1.2 2007/11/15 21:14:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/tsearch/dicts/regis.h,v 1.3 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,7 @@ typedef struct RegisNode unused:14; struct RegisNode *next; unsigned char data[1]; -} RegisNode; +} RegisNode; #define RNHDRSZ (offsetof(RegisNode,data)) @@ -36,14 +36,14 @@ typedef struct Regis issuffix:1, nchar:16, unused:15; -} Regis; +} Regis; bool RS_isRegis(const char *str); -void RS_compile(Regis * r, bool issuffix, char *str); -void RS_free(Regis * r); +void RS_compile(Regis *r, bool issuffix, char *str); +void RS_free(Regis *r); /*returns true if matches */ -bool RS_execute(Regis * r, char *str); +bool RS_execute(Regis *r, char *str); #endif diff --git a/src/include/tsearch/dicts/spell.h b/src/include/tsearch/dicts/spell.h index cfcc9391d63..dea3ddd84b5 100644 --- a/src/include/tsearch/dicts/spell.h +++ b/src/include/tsearch/dicts/spell.h @@ -6,7 +6,7 @@ * * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/tsearch/dicts/spell.h,v 1.4 2007/11/15 21:14:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/tsearch/dicts/spell.h,v 1.5 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,7 +33,7 @@ typedef struct compoundflag:4, affix:19; struct SPNode *node; -} SPNodeData; +} SPNodeData; /* * Names of FF_ are correlated with Hunspell options in affix file @@ -50,7 +50,7 @@ typedef struct SPNode { uint32 length; SPNodeData data[1]; -} SPNode; +} SPNode; #define SPNHDRSZ (offsetof(SPNode,data)) @@ -71,7 +71,7 @@ typedef struct spell_struct } d; } p; char word[1]; /* variable length, null-terminated */ -} SPELL; +} SPELL; #define SPELLHDRSZ (offsetof(SPELL, word)) @@ -90,7 +90,7 @@ typedef struct aff_struct regex_t regex; Regis regis; } reg; -} AFFIX; +} AFFIX; /* * affixes use dictionary flags too @@ -114,14 +114,14 @@ typedef struct naff:24; AFFIX **aff; struct AffixNode *node; -} AffixNodeData; +} AffixNodeData; typedef struct AffixNode { uint32 isvoid:1, length:31; AffixNodeData data[1]; -} AffixNode; +} AffixNode; #define ANHRDSZ (offsetof(AffixNode, data)) @@ -130,7 +130,7 @@ typedef struct char *affix; int len; bool issuffix; -} CMPDAffix; +} CMPDAffix; typedef struct { @@ -158,12 +158,12 @@ typedef struct unsigned char flagval[256]; bool usecompound; -} IspellDict; +} IspellDict; -extern TSLexeme *NINormalizeWord(IspellDict * Conf, char *word); -extern void NIImportAffixes(IspellDict * Conf, const char *filename); -extern void NIImportDictionary(IspellDict * Conf, const char *filename); -extern void NISortDictionary(IspellDict * Conf); -extern void NISortAffixes(IspellDict * Conf); +extern TSLexeme *NINormalizeWord(IspellDict *Conf, char *word); +extern void NIImportAffixes(IspellDict *Conf, const char *filename); +extern void NIImportDictionary(IspellDict *Conf, const char *filename); +extern void NISortDictionary(IspellDict *Conf); +extern void NISortAffixes(IspellDict *Conf); #endif diff --git a/src/include/tsearch/ts_cache.h b/src/include/tsearch/ts_cache.h index c24a14c55a5..a5a23c2f676 100644 --- a/src/include/tsearch/ts_cache.h +++ b/src/include/tsearch/ts_cache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/tsearch/ts_cache.h,v 1.2 2007/11/15 21:14:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/tsearch/ts_cache.h,v 1.3 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,7 +25,7 @@ typedef struct TSAnyCacheEntry { Oid objId; bool isvalid; -} TSAnyCacheEntry; +} TSAnyCacheEntry; typedef struct TSParserCacheEntry @@ -47,7 +47,7 @@ typedef struct TSParserCacheEntry FmgrInfo prstoken; FmgrInfo prsend; FmgrInfo prsheadline; -} TSParserCacheEntry; +} TSParserCacheEntry; typedef struct TSDictionaryCacheEntry { @@ -61,13 +61,13 @@ typedef struct TSDictionaryCacheEntry MemoryContext dictCtx; /* memory context to store private data */ void *dictData; -} TSDictionaryCacheEntry; +} TSDictionaryCacheEntry; typedef struct { int len; Oid *dictIds; -} ListDictionary; +} ListDictionary; typedef struct { @@ -79,7 +79,7 @@ typedef struct int lenmap; ListDictionary *map; -} TSConfigCacheEntry; +} TSConfigCacheEntry; /* diff --git a/src/include/tsearch/ts_public.h b/src/include/tsearch/ts_public.h index d07e138464c..9ae5ce53b12 100644 --- a/src/include/tsearch/ts_public.h +++ b/src/include/tsearch/ts_public.h @@ -6,7 +6,7 @@ * * Copyright (c) 1998-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/tsearch/ts_public.h,v 1.6 2007/11/15 21:14:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/tsearch/ts_public.h,v 1.7 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ typedef struct int lexid; char *alias; char *descr; -} LexDescr; +} LexDescr; /* * Interface to headline generator @@ -43,7 +43,7 @@ typedef struct len:16; char *word; QueryOperand *item; -} HeadlineWordEntry; +} HeadlineWordEntry; typedef struct { @@ -54,7 +54,7 @@ typedef struct char *stopsel; int2 startsellen; int2 stopsellen; -} HeadlineParsedText; +} HeadlineParsedText; /* * Common useful things for tsearch subsystem @@ -71,11 +71,11 @@ typedef struct { int len; char **stop; -} StopList; +} StopList; -extern void readstoplist(const char *fname, StopList * s, +extern void readstoplist(const char *fname, StopList *s, char *(*wordop) (const char *)); -extern bool searchstoplist(StopList * s, char *key); +extern bool searchstoplist(StopList *s, char *key); /* * Interface with dictionaries @@ -96,7 +96,7 @@ typedef struct /* C-string */ char *lexeme; -} TSLexeme; +} TSLexeme; #define TSL_ADDPOS 0x01 @@ -111,6 +111,6 @@ typedef struct bool getnext; /* out: dict wants next lexeme */ void *private; /* internal dict state between calls with * getnext == true */ -} DictSubState; +} DictSubState; #endif /* _PG_TS_PUBLIC_H_ */ diff --git a/src/include/tsearch/ts_type.h b/src/include/tsearch/ts_type.h index 1d0fa44ba5f..d56e35cda2c 100644 --- a/src/include/tsearch/ts_type.h +++ b/src/include/tsearch/ts_type.h @@ -5,7 +5,7 @@ * * Copyright (c) 1998-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/tsearch/ts_type.h,v 1.8 2007/11/15 21:14:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/tsearch/ts_type.h,v 1.9 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ typedef struct haspos:1, len:11, /* MAX 2Kb */ pos:20; /* MAX 1Mb */ -} WordEntry; +} WordEntry; #define MAXSTRLEN ( (1<<11) - 1) #define MAXSTRPOS ( (1<<20) - 1) @@ -47,7 +47,7 @@ typedef struct { uint16 npos; WordEntryPos pos[1]; /* var length */ -} WordEntryPosVector; +} WordEntryPosVector; #define WEP_GETWEIGHT(x) ( (x) >> 14 ) @@ -84,7 +84,7 @@ typedef struct int32 size; WordEntry entries[1]; /* var size */ /* lexemes follow */ -} TSVectorData; +} TSVectorData; typedef TSVectorData *TSVector; @@ -188,7 +188,7 @@ typedef struct uint32 length:12, distance:20; -} QueryOperand; +} QueryOperand; /* Legal values for QueryOperator.operator */ @@ -203,7 +203,7 @@ typedef struct uint32 left; /* pointer to left operand. Right operand is * item + 1, left operand is placed * item+item->left */ -} QueryOperator; +} QueryOperator; /* * Note: TSQuery is 4-bytes aligned, so make sure there's no fields @@ -214,7 +214,7 @@ typedef union QueryItemType type; QueryOperator operator; QueryOperand operand; -} QueryItem; +} QueryItem; /* * Storage: @@ -226,7 +226,7 @@ typedef struct int32 vl_len_; /* varlena header (do not touch directly!) */ int4 size; /* number of QueryItems */ char data[1]; -} TSQueryData; +} TSQueryData; typedef TSQueryData *TSQuery; diff --git a/src/include/tsearch/ts_utils.h b/src/include/tsearch/ts_utils.h index 2ed8485ec01..07507098298 100644 --- a/src/include/tsearch/ts_utils.h +++ b/src/include/tsearch/ts_utils.h @@ -5,7 +5,7 @@ * * Copyright (c) 1998-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.9 2007/11/15 21:14:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.10 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,7 @@ extern TSVectorParseState init_tsvector_parser(char *input, extern void reset_tsvector_parser(TSVectorParseState state, char *input); extern bool gettoken_tsvector(TSVectorParseState state, char **token, int *len, - WordEntryPos ** pos, int *poslen, + WordEntryPos **pos, int *poslen, char **endptr); extern void close_tsvector_parser(TSVectorParseState state); @@ -76,7 +76,7 @@ typedef struct } pos; char *word; uint32 alen; -} ParsedWord; +} ParsedWord; typedef struct { @@ -84,9 +84,9 @@ typedef struct int4 lenwords; int4 curwords; int4 pos; -} ParsedText; +} ParsedText; -extern void parsetext(Oid cfgId, ParsedText * prs, char *buf, int4 buflen); +extern void parsetext(Oid cfgId, ParsedText *prs, char *buf, int4 buflen); /* * headline framework, flow in common to generate: @@ -95,16 +95,16 @@ extern void parsetext(Oid cfgId, ParsedText * prs, char *buf, int4 buflen); * 3 generateHeadline to generate result text */ -extern void hlparsetext(Oid cfgId, HeadlineParsedText * prs, TSQuery query, +extern void hlparsetext(Oid cfgId, HeadlineParsedText *prs, TSQuery query, char *buf, int4 buflen); -extern text *generateHeadline(HeadlineParsedText * prs); +extern text *generateHeadline(HeadlineParsedText *prs); /* * Common check function for tsvector @@ tsquery */ -extern bool TS_execute(QueryItem * curitem, void *checkval, bool calcnot, - bool (*chkcond) (void *checkval, QueryOperand * val)); +extern bool TS_execute(QueryItem *curitem, void *checkval, bool calcnot, + bool (*chkcond) (void *checkval, QueryOperand *val)); /* * Useful conversion macros @@ -115,7 +115,7 @@ extern bool TS_execute(QueryItem * curitem, void *checkval, bool calcnot, /* * to_ts* - text transformation to tsvector, tsquery */ -extern TSVector make_tsvector(ParsedText * prs); +extern TSVector make_tsvector(ParsedText *prs); extern Datum to_tsvector_byid(PG_FUNCTION_ARGS); extern Datum to_tsvector(PG_FUNCTION_ARGS); @@ -162,8 +162,8 @@ extern Datum gin_ts_consistent(PG_FUNCTION_ARGS); /* * TSQuery Utilities */ -extern QueryItem *clean_NOT(QueryItem * ptr, int4 *len); -extern QueryItem *clean_fakeval(QueryItem * ptr, int4 *len); +extern QueryItem *clean_NOT(QueryItem *ptr, int4 *len); +extern QueryItem *clean_fakeval(QueryItem *ptr, int4 *len); typedef struct QTNode { @@ -173,7 +173,7 @@ typedef struct QTNode char *word; uint32 sign; struct QTNode **child; -} QTNode; +} QTNode; /* bits in QTNode.flags */ #define QTN_NEEDFREE 0x01 @@ -185,18 +185,18 @@ typedef uint64 TSQuerySign; #define TSQS_SIGLEN (sizeof(TSQuerySign)*BITS_PER_BYTE) -extern QTNode *QT2QTN(QueryItem * in, char *operand); -extern TSQuery QTN2QT(QTNode * in); -extern void QTNFree(QTNode * in); -extern void QTNSort(QTNode * in); -extern void QTNTernary(QTNode * in); -extern void QTNBinary(QTNode * in); -extern int QTNodeCompare(QTNode * an, QTNode * bn); -extern QTNode *QTNCopy(QTNode * in); -extern void QTNClearFlags(QTNode * in, uint32 flags); -extern bool QTNEq(QTNode * a, QTNode * b); +extern QTNode *QT2QTN(QueryItem *in, char *operand); +extern TSQuery QTN2QT(QTNode *in); +extern void QTNFree(QTNode *in); +extern void QTNSort(QTNode *in); +extern void QTNTernary(QTNode *in); +extern void QTNBinary(QTNode *in); +extern int QTNodeCompare(QTNode *an, QTNode *bn); +extern QTNode *QTNCopy(QTNode *in); +extern void QTNClearFlags(QTNode *in, uint32 flags); +extern bool QTNEq(QTNode *a, QTNode *b); extern TSQuerySign makeTSQuerySign(TSQuery a); -extern QTNode *findsubquery(QTNode * root, QTNode * ex, QTNode * subs, +extern QTNode *findsubquery(QTNode *root, QTNode *ex, QTNode *subs, bool *isfind); /* diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index ea525f51aec..674b0113ef1 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -7,7 +7,7 @@ * Copyright (c) 2000-2007, PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. * - * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.87 2007/11/15 21:14:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.88 2007/11/15 22:25:17 momjian Exp $ *-------------------------------------------------------------------- */ #ifndef GUC_H @@ -106,7 +106,7 @@ typedef enum GUC_ACTION_SET, /* regular SET command */ GUC_ACTION_LOCAL, /* SET LOCAL command */ GUC_ACTION_SAVE /* function SET option */ -} GucAction; +} GucAction; #define GUC_QUALIFIER_SEPARATOR '.' diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h index 6685ba3e93f..c99072a33e8 100644 --- a/src/include/utils/guc_tables.h +++ b/src/include/utils/guc_tables.h @@ -7,7 +7,7 @@ * * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/utils/guc_tables.h,v 1.36 2007/11/15 21:14:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/guc_tables.h,v 1.37 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -89,7 +89,7 @@ typedef enum GUC_SET, /* entry caused by plain SET command */ GUC_LOCAL, /* entry caused by SET LOCAL command */ GUC_SET_LOCAL /* entry caused by SET then SET LOCAL */ -} GucStackState; +} GucStackState; typedef struct guc_stack { diff --git a/src/include/utils/plancache.h b/src/include/utils/plancache.h index 2f8c423352c..e53b97b1ffe 100644 --- a/src/include/utils/plancache.h +++ b/src/include/utils/plancache.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/plancache.h,v 1.9 2007/11/15 21:14:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/plancache.h,v 1.10 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,7 +60,7 @@ typedef struct CachedPlanSource struct CachedPlan *plan; /* link to plan, or NULL if not valid */ MemoryContext context; /* context containing this CachedPlanSource */ struct CachedPlan *orig_plan; /* link to plan owning my context */ -} CachedPlanSource; +} CachedPlanSource; /* * CachedPlan represents the portion of a cached plan that is discarded when @@ -80,7 +80,7 @@ typedef struct CachedPlan int refcount; /* count of live references to this struct */ int generation; /* counter, starting at 1, for replans */ MemoryContext context; /* context containing this CachedPlan */ -} CachedPlan; +} CachedPlan; extern void InitPlanCache(void); @@ -103,10 +103,10 @@ extern CachedPlanSource *FastCreateCachedPlan(Node *raw_parse_tree, bool fully_planned, bool fixed_result, MemoryContext context); -extern void DropCachedPlan(CachedPlanSource * plansource); -extern CachedPlan *RevalidateCachedPlan(CachedPlanSource * plansource, +extern void DropCachedPlan(CachedPlanSource *plansource); +extern CachedPlan *RevalidateCachedPlan(CachedPlanSource *plansource, bool useResOwner); -extern void ReleaseCachedPlan(CachedPlan * plan, bool useResOwner); +extern void ReleaseCachedPlan(CachedPlan *plan, bool useResOwner); extern TupleDesc PlanCacheComputeResultDesc(List *stmt_list); extern void ResetPlanCache(void); diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 11453fbd8cd..d36b534fe08 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -39,7 +39,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.76 2007/11/15 21:14:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.77 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -209,7 +209,7 @@ extern void PortalDefineQuery(Portal portal, const char *sourceText, const char *commandTag, List *stmts, - CachedPlan * cplan); + CachedPlan *cplan); extern Node *PortalListGetPrimaryStmt(List *stmts); extern void PortalCreateHoldStore(Portal portal); extern void PortalHashTableDeleteAll(void); diff --git a/src/include/utils/resowner.h b/src/include/utils/resowner.h index 5caa0acef1f..ebb0036022e 100644 --- a/src/include/utils/resowner.h +++ b/src/include/utils/resowner.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/resowner.h,v 1.13 2007/11/15 21:14:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/resowner.h,v 1.14 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -110,9 +110,9 @@ extern void ResourceOwnerForgetRelationRef(ResourceOwner owner, /* support for plancache refcount management */ extern void ResourceOwnerEnlargePlanCacheRefs(ResourceOwner owner); extern void ResourceOwnerRememberPlanCacheRef(ResourceOwner owner, - CachedPlan * plan); + CachedPlan *plan); extern void ResourceOwnerForgetPlanCacheRef(ResourceOwner owner, - CachedPlan * plan); + CachedPlan *plan); /* support for tupledesc refcount management */ extern void ResourceOwnerEnlargeTupleDescs(ResourceOwner owner); diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index 1f421424721..44c62cdcc5a 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/tqual.h,v 1.69 2007/11/15 21:14:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/tqual.h,v 1.70 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,9 +40,9 @@ typedef struct SnapshotData * specially by HeapTupleSatisfiesDirty.) * * An MVCC snapshot can never see the effects of XIDs >= xmax. It can see - * the effects of all older XIDs except those listed in the snapshot. - * xmin is stored as an optimization to avoid needing to search the XID - * arrays for most tuples. + * the effects of all older XIDs except those listed in the snapshot. xmin + * is stored as an optimization to avoid needing to search the XID arrays + * for most tuples. */ TransactionId xmin; /* all XID < xmin are visible to me */ TransactionId xmax; /* all XID >= xmax are invisible to me */ diff --git a/src/include/utils/xml.h b/src/include/utils/xml.h index 1d2d060e5cf..9f3d213dfdd 100644 --- a/src/include/utils/xml.h +++ b/src/include/utils/xml.h @@ -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/include/utils/xml.h,v 1.20 2007/11/15 21:14:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/xml.h,v 1.21 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,15 +61,15 @@ typedef enum XML_STANDALONE_NO, XML_STANDALONE_NO_VALUE, XML_STANDALONE_OMITTED -} XmlStandaloneType; +} XmlStandaloneType; extern xmltype *xmlconcat(List *args); -extern xmltype *xmlelement(XmlExprState * xmlExpr, ExprContext *econtext); +extern xmltype *xmlelement(XmlExprState *xmlExpr, ExprContext *econtext); extern xmltype *xmlparse(text *data, XmlOptionType xmloption, bool preserve_whitespace); extern xmltype *xmlpi(char *target, text *arg, bool arg_is_null, bool *result_is_null); -extern xmltype *xmlroot(xmltype * data, text *version, int standalone); -extern bool xml_is_document(xmltype * arg); -extern text *xmltotext_with_xmloption(xmltype * data, XmlOptionType xmloption_arg); +extern xmltype *xmlroot(xmltype *data, text *version, int standalone); +extern bool xml_is_document(xmltype *arg); +extern text *xmltotext_with_xmloption(xmltype *data, XmlOptionType xmloption_arg); extern char *map_sql_identifier_to_xml_name(char *ident, bool fully_escaped, bool escape_period); extern char *map_xml_name_to_sql_identifier(char *name); @@ -79,7 +79,7 @@ typedef enum { XMLBINARY_BASE64, XMLBINARY_HEX -} XmlBinaryType; +} XmlBinaryType; extern XmlBinaryType xmlbinary; diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c index 930bb4f64e6..616310e6501 100644 --- a/src/interfaces/ecpg/ecpglib/prepare.c +++ b/src/interfaces/ecpg/ecpglib/prepare.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/prepare.c,v 1.24 2007/11/15 21:14:45 momjian Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/prepare.c,v 1.25 2007/11/15 22:25:17 momjian Exp $ */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" @@ -28,7 +28,7 @@ typedef struct char *ecpgQuery; long execs; /* # of executions */ char *connection; /* connection for the statement */ -} stmtCacheEntry; +} stmtCacheEntry; static int nextStmtID = 1; static const int stmtCacheNBuckets = 2039; /* # buckets - a prime # */ diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index 63996f31e54..936bbcc0828 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -1,7 +1,7 @@ /********************************************************************** * plperl.c - perl as a procedural language for PostgreSQL * - * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.131 2007/11/15 21:14:46 momjian Exp $ + * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.132 2007/11/15 22:25:17 momjian Exp $ * **********************************************************************/ @@ -63,7 +63,7 @@ typedef struct plperl_proc_entry char proc_name[NAMEDATALEN]; /* internal name, eg * __PLPerl_proc_39987 */ plperl_proc_desc *proc_data; -} plperl_proc_entry; +} plperl_proc_entry; /* * The information we cache for the duration of a single call to a @@ -98,7 +98,7 @@ typedef struct plperl_query_entry { char query_name[NAMEDATALEN]; plperl_query_desc *query_data; -} plperl_query_entry; +} plperl_query_entry; /********************************************************************** * Global data @@ -111,7 +111,7 @@ typedef enum INTERP_TRUSTED, INTERP_UNTRUSTED, INTERP_BOTH -} InterpState; +} InterpState; static InterpState interp_state = INTERP_NONE; static bool can_run_two = false; @@ -2571,8 +2571,8 @@ hv_store_string(HV *hv, const char *key, SV *val) /* * This seems nowhere documented, but under Perl 5.8.0 and up, hv_store() - * recognizes a negative klen parameter as meaning a UTF-8 encoded key. - * It does not appear that hashes track UTF-8-ness of keys at all in Perl + * recognizes a negative klen parameter as meaning a UTF-8 encoded key. It + * does not appear that hashes track UTF-8-ness of keys at all in Perl * 5.6. */ #if PERL_BCDVERSION >= 0x5008000L diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index d06fe494f15..dcaf11dddd5 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.200 2007/11/15 21:14:46 momjian Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.201 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,7 +60,7 @@ typedef struct SimpleEstateStackEntry long int xact_estate_simple_id; /* ID for xact_eval_estate */ SubTransactionId xact_subxid; /* ID for current subxact */ struct SimpleEstateStackEntry *next; /* next stack entry up */ -} SimpleEstateStackEntry; +} SimpleEstateStackEntry; static SimpleEstateStackEntry *simple_estate_stack = NULL; static long int simple_estate_id_counter = 0; @@ -106,7 +106,7 @@ static int exec_stmt_return(PLpgSQL_execstate *estate, static int exec_stmt_return_next(PLpgSQL_execstate *estate, PLpgSQL_stmt_return_next *stmt); static int exec_stmt_return_query(PLpgSQL_execstate *estate, - PLpgSQL_stmt_return_query * stmt); + PLpgSQL_stmt_return_query *stmt); static int exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt); static int exec_stmt_execsql(PLpgSQL_execstate *estate, @@ -2151,7 +2151,7 @@ exec_stmt_return_next(PLpgSQL_execstate *estate, */ static int exec_stmt_return_query(PLpgSQL_execstate *estate, - PLpgSQL_stmt_return_query * stmt) + PLpgSQL_stmt_return_query *stmt) { Portal portal; diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c index f2cfdc0155c..573bfd4e0c9 100644 --- a/src/pl/plpgsql/src/pl_funcs.c +++ b/src/pl/plpgsql/src/pl_funcs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.64 2007/11/15 21:14:46 momjian Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.65 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -486,7 +486,7 @@ static void dump_fors(PLpgSQL_stmt_fors *stmt); static void dump_exit(PLpgSQL_stmt_exit *stmt); static void dump_return(PLpgSQL_stmt_return *stmt); static void dump_return_next(PLpgSQL_stmt_return_next *stmt); -static void dump_return_query(PLpgSQL_stmt_return_query * stmt); +static void dump_return_query(PLpgSQL_stmt_return_query *stmt); static void dump_raise(PLpgSQL_stmt_raise *stmt); static void dump_execsql(PLpgSQL_stmt_execsql *stmt); static void dump_dynexecute(PLpgSQL_stmt_dynexecute *stmt); @@ -885,7 +885,7 @@ dump_return_next(PLpgSQL_stmt_return_next *stmt) } static void -dump_return_query(PLpgSQL_stmt_return_query * stmt) +dump_return_query(PLpgSQL_stmt_return_query *stmt) { dump_ind(); printf("RETURN QUERY "); diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h index 6cac7443830..6ba0126b494 100644 --- a/src/pl/plpgsql/src/plpgsql.h +++ b/src/pl/plpgsql/src/plpgsql.h @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.92 2007/11/15 21:14:46 momjian Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.93 2007/11/15 22:25:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -499,7 +499,7 @@ typedef struct int cmd_type; int lineno; PLpgSQL_expr *query; -} PLpgSQL_stmt_return_query; +} PLpgSQL_stmt_return_query; typedef struct { /* RAISE statement */ diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c index 58914bb3a46..43a1597fe5c 100644 --- a/src/timezone/pgtz.c +++ b/src/timezone/pgtz.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.55 2007/11/15 21:14:46 momjian Exp $ + * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.56 2007/11/15 22:25:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -907,7 +907,7 @@ static const struct "Australia/Perth" }, /* (GMT+08:00) Perth */ /* {"W. Central Africa Standard Time", "W. Central Africa Daylight Time", - * * * * * * ""}, Could not find a match for this one. Excluded for now. *//* ( + * * * * * * * ""}, Could not find a match for this one. Excluded for now. *//* ( * G MT+01:00) West Central Africa */ { "W. Europe Standard Time", "W. Europe Daylight Time", @@ -1087,7 +1087,7 @@ typedef struct /* tznameupper contains the all-upper-case name of the timezone */ char tznameupper[TZ_STRLEN_MAX + 1]; pg_tz tz; -} pg_tz_cache; +} pg_tz_cache; static HTAB *timezone_cache = NULL; |