diff options
| author | Bruce Momjian | 2003-08-08 21:42:59 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2003-08-08 21:42:59 +0000 |
| commit | 46785776c42143af8f5433bb580ff13f2a9f65e1 (patch) | |
| tree | 0c1f6da64634a202ff20176865b4a9dc69b8ac40 /src/include | |
| parent | 0e2b12bd9689ac4fd353f7dba33dd796d0e3a07d (diff) | |
Another pgindent run with updated typedefs.
Diffstat (limited to 'src/include')
33 files changed, 196 insertions, 201 deletions
diff --git a/src/include/access/genam.h b/src/include/access/genam.h index 3f72fe0131..3baedbef0d 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: genam.h,v 1.42 2003/08/04 02:40:10 momjian Exp $ + * $Id: genam.h,v 1.43 2003/08/08 21:42:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,7 @@ typedef struct IndexVacuumCleanupInfo { bool vacuum_full; /* VACUUM FULL (we have exclusive lock) */ int message_level; /* ereport level for progress messages */ -} IndexVacuumCleanupInfo; +} IndexVacuumCleanupInfo; /* Struct for heap-or-index scans of system tables */ typedef struct SysScanDescData @@ -89,7 +89,7 @@ extern IndexBulkDeleteResult *index_bulk_delete(Relation indexRelation, IndexBulkDeleteCallback callback, void *callback_state); extern IndexBulkDeleteResult *index_vacuum_cleanup(Relation indexRelation, - IndexVacuumCleanupInfo * info, + IndexVacuumCleanupInfo *info, IndexBulkDeleteResult *stats); extern RegProcedure index_cost_estimator(Relation indexRelation); extern RegProcedure index_getprocid(Relation irel, AttrNumber attnum, diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index 70e7d159fc..6d9c0081a9 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nbtree.h,v 1.69 2003/08/04 02:40:10 momjian Exp $ + * $Id: nbtree.h,v 1.70 2003/08/08 21:42:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -217,7 +217,7 @@ typedef struct xl_btree_metadata uint32 level; BlockNumber fastroot; uint32 fastlevel; -} xl_btree_metadata; +} xl_btree_metadata; /* * This is what we need to know about simple (without split) insert. @@ -291,7 +291,7 @@ typedef struct xl_btree_delete_page BlockNumber leftblk; /* child block's left sibling, if any */ BlockNumber rightblk; /* child block's right sibling */ /* xl_btree_metadata FOLLOWS IF XLOG_BTREE_DELETE_PAGE_META */ -} xl_btree_delete_page; +} xl_btree_delete_page; #define SizeOfBtreeDeletePage (offsetof(xl_btree_delete_page, rightblk) + sizeof(BlockNumber)) @@ -321,7 +321,7 @@ typedef struct xl_btree_newmeta { RelFileNode node; xl_btree_metadata meta; -} xl_btree_newmeta; +} xl_btree_newmeta; #define SizeOfBtreeNewmeta (sizeof(xl_btree_newmeta)) @@ -333,7 +333,7 @@ typedef struct xl_btree_newpage RelFileNode node; BlockNumber blkno; /* location of new page */ /* entire page contents follow at end of record */ -} xl_btree_newpage; +} xl_btree_newpage; #define SizeOfBtreeNewpage (offsetof(xl_btree_newpage, blkno) + sizeof(BlockNumber)) diff --git a/src/include/access/slru.h b/src/include/access/slru.h index 6a8b63a3ff..61384ecb45 100644 --- a/src/include/access/slru.h +++ b/src/include/access/slru.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: slru.h,v 1.2 2003/08/04 00:43:30 momjian Exp $ + * $Id: slru.h,v 1.3 2003/08/08 21:42:32 momjian Exp $ */ #ifndef SLRU_H #define SLRU_H @@ -25,7 +25,7 @@ typedef struct SlruLockData * doesn't need to be in shared memory. */ LWLockId BufferLocks[NUM_CLOG_BUFFERS]; /* Per-buffer I/O locks */ -} SlruLockData; +} SlruLockData; typedef SlruLockData *SlruLock; typedef struct SlruCtlData @@ -47,7 +47,7 @@ typedef struct SlruCtlData */ bool (*PagePrecedes) (int, int); -} SlruCtlData; +} SlruCtlData; typedef SlruCtlData *SlruCtl; extern int SimpleLruShmemSize(void); diff --git a/src/include/access/xact.h b/src/include/access/xact.h index 2239c04dd7..cbd1f3e449 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xact.h,v 1.54 2003/08/04 02:40:10 momjian Exp $ + * $Id: xact.h,v 1.55 2003/08/08 21:42:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,7 +44,7 @@ typedef enum TransState TRANS_INPROGRESS, TRANS_COMMIT, TRANS_ABORT -} TransState; +} TransState; /* * transaction block states - transaction state of client queries @@ -57,7 +57,7 @@ typedef enum TBlockState TBLOCK_END, TBLOCK_ABORT, TBLOCK_ENDABORT -} TBlockState; +} TBlockState; /* ---------------- * transaction state structure diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h index dec6a3831d..2834610ac6 100644 --- a/src/include/catalog/pg_constraint.h +++ b/src/include/catalog/pg_constraint.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_constraint.h,v 1.8 2003/08/04 02:40:12 momjian Exp $ + * $Id: pg_constraint.h,v 1.9 2003/08/08 21:42:32 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -149,7 +149,7 @@ typedef enum CONSTRAINTCATEGORY CONSTRAINT_RELATION, CONSTRAINT_DOMAIN, CONSTRAINT_ASSERTION -} CONSTRAINTCATEGORY; +} CONSTRAINTCATEGORY; /* * prototypes for functions in pg_constraint.c diff --git a/src/include/commands/portalcmds.h b/src/include/commands/portalcmds.h index 136417269a..d6598d3c9b 100644 --- a/src/include/commands/portalcmds.h +++ b/src/include/commands/portalcmds.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: portalcmds.h,v 1.12 2003/08/04 02:40:13 momjian Exp $ + * $Id: portalcmds.h,v 1.13 2003/08/08 21:42:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,7 @@ #include "utils/portal.h" -extern void PerformCursorOpen(DeclareCursorStmt * stmt); +extern void PerformCursorOpen(DeclareCursorStmt *stmt); extern void PerformPortalFetch(FetchStmt *stmt, DestReceiver *dest, char *completionTag); diff --git a/src/include/commands/prepare.h b/src/include/commands/prepare.h index ca6bbb4d93..fdbea2c608 100644 --- a/src/include/commands/prepare.h +++ b/src/include/commands/prepare.h @@ -6,7 +6,7 @@ * * Copyright (c) 2002-2003, PostgreSQL Global Development Group * - * $Id: prepare.h,v 1.7 2003/08/04 00:43:30 momjian Exp $ + * $Id: prepare.h,v 1.8 2003/08/08 21:42:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,7 +37,7 @@ typedef struct List *plan_list; /* list of plans */ List *argtype_list; /* list of parameter type OIDs */ MemoryContext context; /* context containing this query */ -} PreparedStatement; +} PreparedStatement; /* Utility statements PREPARE, EXECUTE, DEALLOCATE, EXPLAIN EXECUTE */ @@ -57,6 +57,6 @@ extern PreparedStatement *FetchPreparedStatement(const char *stmt_name, bool throwError); extern void DropPreparedStatement(const char *stmt_name, bool showError); extern List *FetchPreparedStatementParams(const char *stmt_name); -extern TupleDesc FetchPreparedStatementResultDesc(PreparedStatement * stmt); +extern TupleDesc FetchPreparedStatementResultDesc(PreparedStatement *stmt); #endif /* PREPARE_H */ diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h index 1fbf0181d8..531e30bb6c 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sequence.h,v 1.25 2003/08/04 02:40:13 momjian Exp $ + * $Id: sequence.h,v 1.26 2003/08/08 21:42:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -84,7 +84,7 @@ extern Datum setval(PG_FUNCTION_ARGS); extern Datum setval_and_iscalled(PG_FUNCTION_ARGS); extern void DefineSequence(CreateSeqStmt *stmt); -extern void AlterSequence(AlterSeqStmt * stmt); +extern void AlterSequence(AlterSeqStmt *stmt); extern void seq_redo(XLogRecPtr lsn, XLogRecord *rptr); extern void seq_undo(XLogRecPtr lsn, XLogRecord *rptr); diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 4fdc0c6643..af2f123d2d 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: executor.h,v 1.98 2003/08/04 02:40:13 momjian Exp $ + * $Id: executor.h,v 1.99 2003/08/08 21:42:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,9 +31,9 @@ /* * prototypes from functions in execAmi.c */ -extern void ExecReScan(PlanState * node, ExprContext *exprCtxt); -extern void ExecMarkPos(PlanState * node); -extern void ExecRestrPos(PlanState * node); +extern void ExecReScan(PlanState *node, ExprContext *exprCtxt); +extern void ExecMarkPos(PlanState *node); +extern void ExecRestrPos(PlanState *node); extern bool ExecSupportsMarkRestore(NodeTag plantype); extern bool ExecSupportsBackwardScan(Plan *node); @@ -72,7 +72,7 @@ extern TupleHashEntry LookupTupleHashEntry(TupleHashTable hashtable, TupleTableSlot *slot, bool *isnew); extern TupleHashEntry ScanTupleHashTable(TupleHashTable hashtable, - TupleHashIterator * state); + TupleHashIterator *state); /* * prototypes from functions in execJunk.c @@ -93,7 +93,7 @@ extern TupleTableSlot *ExecutorRun(QueryDesc *queryDesc, extern void ExecutorEnd(QueryDesc *queryDesc); extern void ExecutorRewind(QueryDesc *queryDesc); extern void ExecCheckRTPerms(List *rangeTable, CmdType operation); -extern void ExecEndPlan(PlanState * planstate, EState *estate); +extern void ExecEndPlan(PlanState *planstate, EState *estate); extern void ExecConstraints(ResultRelInfo *resultRelInfo, TupleTableSlot *slot, EState *estate); extern TupleTableSlot *EvalPlanQual(EState *estate, Index rti, @@ -103,9 +103,9 @@ extern TupleTableSlot *EvalPlanQual(EState *estate, Index rti, * prototypes from functions in execProcnode.c */ extern PlanState *ExecInitNode(Plan *node, EState *estate); -extern TupleTableSlot *ExecProcNode(PlanState * node); +extern TupleTableSlot *ExecProcNode(PlanState *node); extern int ExecCountSlotsNode(Plan *node); -extern void ExecEndNode(PlanState * node); +extern void ExecEndNode(PlanState *node); /* * prototypes from functions in execQual.c @@ -114,22 +114,22 @@ extern Datum GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno, bool *isNull); extern Datum GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull); -extern void init_fcache(Oid foid, FuncExprState * fcache, +extern void init_fcache(Oid foid, FuncExprState *fcache, MemoryContext fcacheCxt); -extern Datum ExecMakeFunctionResult(FuncExprState * fcache, +extern Datum ExecMakeFunctionResult(FuncExprState *fcache, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone); -extern Tuplestorestate *ExecMakeTableFunctionResult(ExprState * funcexpr, +extern Tuplestorestate *ExecMakeTableFunctionResult(ExprState *funcexpr, ExprContext *econtext, TupleDesc expectedDesc, TupleDesc *returnDesc); -extern Datum ExecEvalExpr(ExprState * expression, ExprContext *econtext, +extern Datum ExecEvalExpr(ExprState *expression, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone); -extern Datum ExecEvalExprSwitchContext(ExprState * expression, ExprContext *econtext, +extern Datum ExecEvalExprSwitchContext(ExprState *expression, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone); -extern ExprState *ExecInitExpr(Expr *node, PlanState * parent); -extern SubPlanState *ExecInitExprInitPlan(SubPlan *node, PlanState * parent); +extern ExprState *ExecInitExpr(Expr *node, PlanState *parent); +extern SubPlanState *ExecInitExprInitPlan(SubPlan *node, PlanState *parent); extern ExprState *ExecPrepareExpr(Expr *node, EState *estate); extern bool ExecQual(List *qual, ExprContext *econtext, bool resultForNull); extern int ExecTargetListLength(List *targetlist); @@ -140,10 +140,10 @@ extern TupleTableSlot *ExecProject(ProjectionInfo *projInfo, /* * prototypes from functions in execScan.c */ -typedef TupleTableSlot *(*ExecScanAccessMtd) (ScanState * node); +typedef TupleTableSlot *(*ExecScanAccessMtd) (ScanState *node); -extern TupleTableSlot *ExecScan(ScanState * node, ExecScanAccessMtd accessMtd); -extern void ExecAssignScanProjectionInfo(ScanState * node); +extern TupleTableSlot *ExecScan(ScanState *node, ExecScanAccessMtd accessMtd); +extern void ExecAssignScanProjectionInfo(ScanState *node); /* * prototypes from functions in execTuples.c @@ -160,14 +160,14 @@ extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot); extern void ExecSetSlotDescriptor(TupleTableSlot *slot, TupleDesc tupdesc, bool shouldFree); extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew); -extern void ExecInitResultTupleSlot(EState *estate, PlanState * planstate); -extern void ExecInitScanTupleSlot(EState *estate, ScanState * scanstate); +extern void ExecInitResultTupleSlot(EState *estate, PlanState *planstate); +extern void ExecInitScanTupleSlot(EState *estate, ScanState *scanstate); extern TupleTableSlot *ExecInitExtraTupleSlot(EState *estate); extern TupleTableSlot *ExecInitNullTupleSlot(EState *estate, TupleDesc tupType); extern TupleDesc ExecTypeFromTL(List *targetList, bool hasoid); extern TupleDesc ExecCleanTypeFromTL(List *targetList, bool hasoid); -extern void UpdateChangedParamSet(PlanState * node, Bitmapset * newchg); +extern void UpdateChangedParamSet(PlanState *node, Bitmapset *newchg); typedef struct TupOutputState { @@ -224,21 +224,21 @@ extern ExprContext *MakePerTupleExprContext(EState *estate); ResetExprContext((estate)->es_per_tuple_exprcontext); \ } while (0) -extern void ExecAssignExprContext(EState *estate, PlanState * planstate); -extern void ExecAssignResultType(PlanState * planstate, +extern void ExecAssignExprContext(EState *estate, PlanState *planstate); +extern void ExecAssignResultType(PlanState *planstate, TupleDesc tupDesc, bool shouldFree); -extern void ExecAssignResultTypeFromOuterPlan(PlanState * planstate); -extern void ExecAssignResultTypeFromTL(PlanState * planstate); -extern TupleDesc ExecGetResultType(PlanState * planstate); +extern void ExecAssignResultTypeFromOuterPlan(PlanState *planstate); +extern void ExecAssignResultTypeFromTL(PlanState *planstate); +extern TupleDesc ExecGetResultType(PlanState *planstate); extern ProjectionInfo *ExecBuildProjectionInfo(List *targetList, ExprContext *econtext, TupleTableSlot *slot); -extern void ExecAssignProjectionInfo(PlanState * planstate); -extern void ExecFreeExprContext(PlanState * planstate); -extern TupleDesc ExecGetScanType(ScanState * scanstate); -extern void ExecAssignScanType(ScanState * scanstate, +extern void ExecAssignProjectionInfo(PlanState *planstate); +extern void ExecFreeExprContext(PlanState *planstate); +extern TupleDesc ExecGetScanType(ScanState *scanstate); +extern void ExecAssignScanType(ScanState *scanstate, TupleDesc tupDesc, bool shouldFree); -extern void ExecAssignScanTypeFromOuterPlan(ScanState * scanstate); +extern void ExecAssignScanTypeFromOuterPlan(ScanState *scanstate); extern void ExecOpenIndices(ResultRelInfo *resultRelInfo); extern void ExecCloseIndices(ResultRelInfo *resultRelInfo); diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h index e63cc37af7..1496dc162c 100644 --- a/src/include/executor/nodeSeqscan.h +++ b/src/include/executor/nodeSeqscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSeqscan.h,v 1.18 2003/08/04 02:40:13 momjian Exp $ + * $Id: nodeSeqscan.h,v 1.19 2003/08/08 21:42:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,10 +18,10 @@ extern int ExecCountSlotsSeqScan(SeqScan *node); extern SeqScanState *ExecInitSeqScan(SeqScan *node, EState *estate); -extern TupleTableSlot *ExecSeqScan(SeqScanState * node); -extern void ExecEndSeqScan(SeqScanState * node); -extern void ExecSeqMarkPos(SeqScanState * node); -extern void ExecSeqRestrPos(SeqScanState * node); -extern void ExecSeqReScan(SeqScanState * node, ExprContext *exprCtxt); +extern TupleTableSlot *ExecSeqScan(SeqScanState *node); +extern void ExecEndSeqScan(SeqScanState *node); +extern void ExecSeqMarkPos(SeqScanState *node); +extern void ExecSeqRestrPos(SeqScanState *node); +extern void ExecSeqReScan(SeqScanState *node, ExprContext *exprCtxt); #endif /* NODESEQSCAN_H */ diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h index e56a384846..00538a39c5 100644 --- a/src/include/executor/nodeSubplan.h +++ b/src/include/executor/nodeSubplan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSubplan.h,v 1.17 2003/08/04 02:40:13 momjian Exp $ + * $Id: nodeSubplan.h,v 1.18 2003/08/08 21:42:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,13 +16,13 @@ #include "nodes/execnodes.h" -extern void ExecInitSubPlan(SubPlanState * node, EState *estate); -extern Datum ExecSubPlan(SubPlanState * node, +extern void ExecInitSubPlan(SubPlanState *node, EState *estate); +extern Datum ExecSubPlan(SubPlanState *node, ExprContext *econtext, bool *isNull); -extern void ExecEndSubPlan(SubPlanState * node); -extern void ExecReScanSetParamPlan(SubPlanState * node, PlanState * parent); +extern void ExecEndSubPlan(SubPlanState *node); +extern void ExecReScanSetParamPlan(SubPlanState *node, PlanState *parent); -extern void ExecSetParamPlan(SubPlanState * node, ExprContext *econtext); +extern void ExecSetParamPlan(SubPlanState *node, ExprContext *econtext); #endif /* NODESUBPLAN_H */ diff --git a/src/include/getaddrinfo.h b/src/include/getaddrinfo.h index 36994647c3..5d1aeef850 100644 --- a/src/include/getaddrinfo.h +++ b/src/include/getaddrinfo.h @@ -15,7 +15,7 @@ * * Copyright (c) 2003, PostgreSQL Global Development Group * - * $Id: getaddrinfo.h,v 1.9 2003/08/07 16:45:21 tgl Exp $ + * $Id: getaddrinfo.h,v 1.10 2003/08/08 21:42:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,7 +41,6 @@ #define EAI_SERVICE -8 #define EAI_MEMORY -10 #define EAI_SYSTEM -11 - #endif #ifndef AI_PASSIVE @@ -79,8 +78,7 @@ struct addrinfo char *ai_canonname; struct addrinfo *ai_next; }; - -#endif /* HAVE_STRUCT_ADDRINFO */ +#endif /* HAVE_STRUCT_ADDRINFO */ #ifndef HAVE_GETADDRINFO @@ -113,7 +111,6 @@ extern const char *gai_strerror(int errcode); extern int getnameinfo(const struct sockaddr * sa, int salen, char *node, int nodelen, char *service, int servicelen, int flags); - #endif /* HAVE_GETADDRINFO */ #endif /* GETADDRINFO_H */ diff --git a/src/include/getopt_long.h b/src/include/getopt_long.h index 9b155b25da..646cb15b58 100644 --- a/src/include/getopt_long.h +++ b/src/include/getopt_long.h @@ -4,7 +4,7 @@ * * Portions Copyright (c) 2003, PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/include/getopt_long.h,v 1.3 2003/08/07 21:11:58 tgl Exp $ + * $Header: /cvsroot/pgsql/src/include/getopt_long.h,v 1.4 2003/08/08 21:42:31 momjian Exp $ */ #ifndef GETOPT_LONG_H #define GETOPT_LONG_H @@ -34,7 +34,6 @@ struct option #define no_argument 0 #define required_argument 1 - #endif #ifndef HAVE_GETOPT_LONG @@ -42,7 +41,6 @@ struct option extern int getopt_long(int argc, char *const argv[], const char *optstring, const struct option * longopts, int *longindex); - #endif -#endif /* GETOPT_LONG_H */ +#endif /* GETOPT_LONG_H */ diff --git a/src/include/nodes/bitmapset.h b/src/include/nodes/bitmapset.h index 6c2e8ac13c..73ad4ad84e 100644 --- a/src/include/nodes/bitmapset.h +++ b/src/include/nodes/bitmapset.h @@ -13,7 +13,7 @@ * * Copyright (c) 2003, PostgreSQL Global Development Group * - * $Id: bitmapset.h,v 1.3 2003/08/04 00:43:31 momjian Exp $ + * $Id: bitmapset.h,v 1.4 2003/08/08 21:42:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,7 +33,7 @@ typedef struct Bitmapset { int nwords; /* number of words in array */ bitmapword words[1]; /* really [nwords] */ -} Bitmapset; /* VARIABLE LENGTH STRUCT */ +} Bitmapset; /* VARIABLE LENGTH STRUCT */ /* result of bms_membership */ @@ -42,42 +42,42 @@ typedef enum BMS_EMPTY_SET, /* 0 members */ BMS_SINGLETON, /* 1 member */ BMS_MULTIPLE /* >1 member */ -} BMS_Membership; +} BMS_Membership; /* * function prototypes in nodes/bitmapset.c */ -extern Bitmapset *bms_copy(const Bitmapset * a); -extern bool bms_equal(const Bitmapset * a, const Bitmapset * b); +extern Bitmapset *bms_copy(const Bitmapset *a); +extern bool bms_equal(const Bitmapset *a, const Bitmapset *b); extern Bitmapset *bms_make_singleton(int x); -extern void bms_free(Bitmapset * a); +extern void bms_free(Bitmapset *a); -extern Bitmapset *bms_union(const Bitmapset * a, const Bitmapset * b); -extern Bitmapset *bms_intersect(const Bitmapset * a, const Bitmapset * b); -extern Bitmapset *bms_difference(const Bitmapset * a, const Bitmapset * b); -extern bool bms_is_subset(const Bitmapset * a, const Bitmapset * b); -extern bool bms_is_member(int x, const Bitmapset * a); -extern bool bms_overlap(const Bitmapset * a, const Bitmapset * b); -extern bool bms_nonempty_difference(const Bitmapset * a, const Bitmapset * b); -extern int bms_singleton_member(const Bitmapset * a); -extern int bms_num_members(const Bitmapset * a); +extern Bitmapset *bms_union(const Bitmapset *a, const Bitmapset *b); +extern Bitmapset *bms_intersect(const Bitmapset *a, const Bitmapset *b); +extern Bitmapset *bms_difference(const Bitmapset *a, const Bitmapset *b); +extern bool bms_is_subset(const Bitmapset *a, const Bitmapset *b); +extern bool bms_is_member(int x, const Bitmapset *a); +extern bool bms_overlap(const Bitmapset *a, const Bitmapset *b); +extern bool bms_nonempty_difference(const Bitmapset *a, const Bitmapset *b); +extern int bms_singleton_member(const Bitmapset *a); +extern int bms_num_members(const Bitmapset *a); /* optimized tests when we don't need to know exact membership count: */ -extern BMS_Membership bms_membership(const Bitmapset * a); -extern bool bms_is_empty(const Bitmapset * a); +extern BMS_Membership bms_membership(const Bitmapset *a); +extern bool bms_is_empty(const Bitmapset *a); /* these routines recycle (modify or free) their non-const inputs: */ -extern Bitmapset *bms_add_member(Bitmapset * a, int x); -extern Bitmapset *bms_del_member(Bitmapset * a, int x); -extern Bitmapset *bms_add_members(Bitmapset * a, const Bitmapset * b); -extern Bitmapset *bms_int_members(Bitmapset * a, const Bitmapset * b); -extern Bitmapset *bms_del_members(Bitmapset * a, const Bitmapset * b); -extern Bitmapset *bms_join(Bitmapset * a, Bitmapset * b); +extern Bitmapset *bms_add_member(Bitmapset *a, int x); +extern Bitmapset *bms_del_member(Bitmapset *a, int x); +extern Bitmapset *bms_add_members(Bitmapset *a, const Bitmapset *b); +extern Bitmapset *bms_int_members(Bitmapset *a, const Bitmapset *b); +extern Bitmapset *bms_del_members(Bitmapset *a, const Bitmapset *b); +extern Bitmapset *bms_join(Bitmapset *a, Bitmapset *b); /* support for iterating through the integer elements of a set: */ -extern int bms_first_member(Bitmapset * a); +extern int bms_first_member(Bitmapset *a); #endif /* BITMAPSET_H */ diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 460fbeef88..3f163b8fda 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execnodes.h,v 1.102 2003/08/04 02:40:13 momjian Exp $ + * $Id: execnodes.h,v 1.103 2003/08/08 21:42:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -348,7 +348,7 @@ typedef struct TupleHashEntryData uint32 hashkey; /* exact hash key of this entry */ HeapTuple firstTuple; /* copy of first tuple in this group */ /* there may be additional data beyond the end of this struct */ -} TupleHashEntryData; /* VARIABLE LENGTH STRUCT */ +} TupleHashEntryData; /* VARIABLE LENGTH STRUCT */ typedef struct TupleHashTableData { @@ -361,13 +361,13 @@ typedef struct TupleHashTableData Size entrysize; /* actual size to make each hash entry */ int nbuckets; /* number of buckets in hash table */ TupleHashEntry buckets[1]; /* VARIABLE LENGTH ARRAY */ -} TupleHashTableData; /* VARIABLE LENGTH STRUCT */ +} TupleHashTableData; /* VARIABLE LENGTH STRUCT */ typedef struct { TupleHashEntry next_entry; /* next entry in current chain */ int next_bucket; /* next chain */ -} TupleHashIterator; +} TupleHashIterator; #define ResetTupleHashIterator(iter) \ ((iter)->next_entry = NULL, \ @@ -399,7 +399,7 @@ typedef struct ExprState { NodeTag type; Expr *expr; /* associated Expr node */ -} ExprState; +} ExprState; /* ---------------- * GenericExprState node @@ -412,7 +412,7 @@ typedef struct GenericExprState { ExprState xprstate; ExprState *arg; /* state of my child node */ -} GenericExprState; +} GenericExprState; /* ---------------- * AggrefExprState node @@ -423,7 +423,7 @@ typedef struct AggrefExprState ExprState xprstate; ExprState *target; /* state of my child node */ int aggno; /* ID number for agg within its plan node */ -} AggrefExprState; +} AggrefExprState; /* ---------------- * ArrayRefExprState node @@ -444,7 +444,7 @@ typedef struct ArrayRefExprState int16 refelemlength; /* typlen of the array element type */ bool refelembyval; /* is the element type pass-by-value? */ char refelemalign; /* typalign of the element type */ -} ArrayRefExprState; +} ArrayRefExprState; /* ---------------- * FuncExprState node @@ -488,7 +488,7 @@ typedef struct FuncExprState * data only if setArgsValid is true. */ FunctionCallInfoData setArgs; -} FuncExprState; +} FuncExprState; /* ---------------- * ScalarArrayOpExprState node @@ -504,7 +504,7 @@ typedef struct ScalarArrayOpExprState int16 typlen; bool typbyval; char typalign; -} ScalarArrayOpExprState; +} ScalarArrayOpExprState; /* ---------------- * BoolExprState node @@ -514,7 +514,7 @@ typedef struct BoolExprState { ExprState xprstate; List *args; /* states of argument expression(s) */ -} BoolExprState; +} BoolExprState; /* ---------------- * SubPlanState node @@ -541,7 +541,7 @@ typedef struct SubPlanState AttrNumber *keyColIdx; /* control data for hash tables */ FmgrInfo *eqfunctions; /* comparison functions for hash tables */ FmgrInfo *hashfunctions; /* lookup data for hash functions */ -} SubPlanState; +} SubPlanState; /* ---------------- * CaseExprState node @@ -552,7 +552,7 @@ typedef struct CaseExprState ExprState xprstate; List *args; /* the arguments (list of WHEN clauses) */ ExprState *defresult; /* the default result (ELSE clause) */ -} CaseExprState; +} CaseExprState; /* ---------------- * CaseWhenState node @@ -563,7 +563,7 @@ typedef struct CaseWhenState ExprState xprstate; ExprState *expr; /* condition expression */ ExprState *result; /* substitution result */ -} CaseWhenState; +} CaseWhenState; /* ---------------- * ArrayExprState node @@ -579,7 +579,7 @@ typedef struct ArrayExprState int16 elemlength; /* typlen of the array element type */ bool elembyval; /* is the element type pass-by-value? */ char elemalign; /* typalign of the element type */ -} ArrayExprState; +} ArrayExprState; /* ---------------- * CoalesceExprState node @@ -589,7 +589,7 @@ typedef struct CoalesceExprState { ExprState xprstate; List *args; /* the arguments */ -} CoalesceExprState; +} CoalesceExprState; /* ---------------- * CoerceToDomainState node @@ -601,7 +601,7 @@ typedef struct CoerceToDomainState ExprState *arg; /* input expression */ /* Cached list of constraints that need to be checked */ List *constraints; /* list of DomainConstraintState nodes */ -} CoerceToDomainState; +} CoerceToDomainState; /* * DomainConstraintState - one item to check during CoerceToDomain @@ -614,7 +614,7 @@ typedef enum DomainConstraintType { DOM_CONSTRAINT_NOTNULL, DOM_CONSTRAINT_CHECK -} DomainConstraintType; +} DomainConstraintType; typedef struct DomainConstraintState { @@ -622,7 +622,7 @@ typedef struct DomainConstraintState DomainConstraintType constrainttype; /* constraint type */ char *name; /* name of constraint (for error msgs) */ ExprState *check_expr; /* for CHECK, a boolean expression */ -} DomainConstraintState; +} DomainConstraintState; /* ---------------------------------------------------------------- @@ -681,7 +681,7 @@ typedef struct PlanState ProjectionInfo *ps_ProjInfo; /* info for doing tuple projection */ bool ps_TupFromTlist;/* state flag for processing set-valued * functions in targetlist */ -} PlanState; +} PlanState; /* ---------------- * these are are defined to avoid confusion problems with "left" @@ -750,7 +750,7 @@ typedef struct ScanState Relation ss_currentRelation; HeapScanDesc ss_currentScanDesc; TupleTableSlot *ss_ScanTupleSlot; -} ScanState; +} ScanState; /* * SeqScan uses a bare ScanState as its state node, since it needs @@ -1100,7 +1100,7 @@ typedef enum LIMIT_SUBPLANEOF, /* at EOF of subplan (within window) */ LIMIT_WINDOWEND, /* stepped off end of window */ LIMIT_WINDOWSTART /* stepped off beginning of window */ -} LimitStateCond; +} LimitStateCond; typedef struct LimitState { diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 3c5c34d386..497ba3b624 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.245 2003/08/04 02:40:13 momjian Exp $ + * $Id: parsenodes.h,v 1.246 2003/08/08 21:42:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,7 +25,7 @@ typedef enum QuerySource QSRC_INSTEAD_RULE, /* added by unconditional INSTEAD rule */ QSRC_QUAL_INSTEAD_RULE, /* added by conditional INSTEAD rule */ QSRC_NON_INSTEAD_RULE /* added by non-INSTEAD rule */ -} QuerySource; +} QuerySource; /***************************************************************************** @@ -175,7 +175,7 @@ typedef enum A_Expr_Kind AEXPR_DISTINCT, /* IS DISTINCT FROM - name must be "=" */ AEXPR_NULLIF, /* NULLIF - name must be "=" */ AEXPR_OF /* IS (not) OF - name must be "=" or "!=" */ -} A_Expr_Kind; +} A_Expr_Kind; typedef struct A_Expr { @@ -352,7 +352,7 @@ typedef struct InhRelation NodeTag type; RangeVar *relation; bool including_defaults; -} InhRelation; +} InhRelation; /* * IndexElem - index parameters (used in CREATE INDEX) @@ -691,7 +691,7 @@ typedef enum ObjectType OBJECT_TYPE, OBJECT_USER, OBJECT_VIEW -} ObjectType; +} ObjectType; /* ---------------------- * Create Schema Statement @@ -774,7 +774,7 @@ typedef struct AlterDomainStmt * new owner */ Node *def; /* definition of default or constraint */ DropBehavior behavior; /* RESTRICT or CASCADE for DROP cases */ -} AlterDomainStmt; +} AlterDomainStmt; /* ---------------------- @@ -879,7 +879,7 @@ typedef enum OnCommitAction ONCOMMIT_PRESERVE_ROWS, /* ON COMMIT PRESERVE ROWS (do nothing) */ ONCOMMIT_DELETE_ROWS, /* ON COMMIT DELETE ROWS */ ONCOMMIT_DROP /* ON COMMIT DROP */ -} OnCommitAction; +} OnCommitAction; typedef struct CreateStmt { @@ -1096,7 +1096,7 @@ typedef struct AlterSeqStmt NodeTag type; RangeVar *sequence; /* the sequence to alter */ List *options; -} AlterSeqStmt; +} AlterSeqStmt; /* ---------------------- * Create {Aggregate|Operator|Type} Statement @@ -1222,7 +1222,7 @@ typedef struct DeclareCursorStmt char *portalname; /* name of the portal (cursor) */ int options; /* bitmask of options (see above) */ Node *query; /* the SELECT query */ -} DeclareCursorStmt; +} DeclareCursorStmt; /* ---------------------- * Close Portal Statement @@ -1246,7 +1246,7 @@ typedef enum FetchDirection /* for these, howMany indicates a position; only one row is fetched */ FETCH_ABSOLUTE, FETCH_RELATIVE -} FetchDirection; +} FetchDirection; #define FETCH_ALL LONG_MAX @@ -1414,7 +1414,7 @@ typedef enum TransactionStmtKind TRANS_STMT_START, /* semantically identical to BEGIN */ TRANS_STMT_COMMIT, TRANS_STMT_ROLLBACK -} TransactionStmtKind; +} TransactionStmtKind; typedef struct TransactionStmt { diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index f768893649..4d9ce8304b 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_list.h,v 1.39 2003/08/04 02:40:13 momjian Exp $ + * $Id: pg_list.h,v 1.40 2003/08/08 21:42:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -137,7 +137,7 @@ typedef struct FastList { List *head; List *tail; -} FastList; +} FastList; #define FastListInit(fl) ( (fl)->head = (fl)->tail = NIL ) #define FastListFromList(fl, l) \ @@ -160,11 +160,11 @@ extern List *lappend(List *list, void *datum); extern List *lappendi(List *list, int datum); extern List *lappendo(List *list, Oid datum); extern List *nconc(List *list1, List *list2); -extern void FastAppend(FastList * fl, void *datum); -extern void FastAppendi(FastList * fl, int datum); -extern void FastAppendo(FastList * fl, Oid datum); -extern void FastConc(FastList * fl, List *cells); -extern void FastConcFast(FastList * fl, FastList * fl2); +extern void FastAppend(FastList *fl, void *datum); +extern void FastAppendi(FastList *fl, int datum); +extern void FastAppendo(FastList *fl, Oid datum); +extern void FastConc(FastList *fl, List *cells); +extern void FastConcFast(FastList *fl, FastList *fl2); extern void *nth(int n, List *l); extern int length(List *list); extern void *llast(List *list); diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 7930d45760..f56dc4653d 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: plannodes.h,v 1.67 2003/08/04 02:40:13 momjian Exp $ + * $Id: plannodes.h,v 1.68 2003/08/08 21:42:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -315,7 +315,7 @@ typedef enum AggStrategy AGG_PLAIN, /* simple agg across all input rows */ AGG_SORTED, /* grouped agg, input must be sorted */ AGG_HASHED /* grouped agg, use internal hashtable */ -} AggStrategy; +} AggStrategy; typedef struct Agg { diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index 40686de3a3..49d5f49467 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: primnodes.h,v 1.89 2003/08/04 02:40:13 momjian Exp $ + * $Id: primnodes.h,v 1.90 2003/08/08 21:42:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -277,7 +277,7 @@ typedef enum CoercionContext COERCION_IMPLICIT, /* coercion in context of expression */ COERCION_ASSIGNMENT, /* coercion in context of assignment */ COERCION_EXPLICIT /* explicit cast operation */ -} CoercionContext; +} CoercionContext; /* * CoercionForm - information showing how to display a function-call node @@ -288,7 +288,7 @@ typedef enum CoercionForm COERCE_EXPLICIT_CAST, /* display as an explicit cast */ COERCE_IMPLICIT_CAST, /* implicit cast, so hide it */ COERCE_DONTCARE /* special case for pathkeys */ -} CoercionForm; +} CoercionForm; /* * FuncExpr - expression node for a function call @@ -301,7 +301,7 @@ typedef struct FuncExpr bool funcretset; /* true if function returns set */ CoercionForm funcformat; /* how to display this function call */ List *args; /* arguments to the function */ -} FuncExpr; +} FuncExpr; /* * OpExpr - expression node for an operator invocation @@ -320,7 +320,7 @@ typedef struct OpExpr Oid opresulttype; /* PG_TYPE OID of result value */ bool opretset; /* true if operator returns set */ List *args; /* arguments to the operator (1 or 2) */ -} OpExpr; +} OpExpr; /* * DistinctExpr - expression node for "x IS DISTINCT FROM y" @@ -351,7 +351,7 @@ typedef struct ScalarArrayOpExpr Oid opfuncid; /* PG_PROC OID of underlying function */ bool useOr; /* true for ANY, false for ALL */ List *args; /* the scalar and array operands */ -} ScalarArrayOpExpr; +} ScalarArrayOpExpr; /* * BoolExpr - expression node for the basic Boolean operators AND, OR, NOT @@ -365,14 +365,14 @@ typedef struct ScalarArrayOpExpr typedef enum BoolExprType { AND_EXPR, OR_EXPR, NOT_EXPR -} BoolExprType; +} BoolExprType; typedef struct BoolExpr { Expr xpr; BoolExprType boolop; List *args; /* arguments to this expression */ -} BoolExpr; +} BoolExpr; /* ---------------- * SubLink @@ -578,7 +578,7 @@ typedef struct ArrayExpr Oid element_typeid; /* common type of expression elements */ List *elements; /* the array elements */ int ndims; /* number of array dimensions */ -} ArrayExpr; +} ArrayExpr; /* * CoalesceExpr - a COALESCE expression @@ -588,7 +588,7 @@ typedef struct CoalesceExpr Expr xpr; Oid coalescetype; /* type of expression result */ List *args; /* the arguments */ -} CoalesceExpr; +} CoalesceExpr; /* * NullIfExpr - a NULLIF expression @@ -657,7 +657,7 @@ typedef struct CoerceToDomain Oid resulttype; /* domain type ID (result type) */ int32 resulttypmod; /* output typmod (currently always -1) */ CoercionForm coercionformat; /* how to display this node */ -} CoerceToDomain; +} CoerceToDomain; /* * Placeholder node for the value to be processed by a domain's check @@ -673,7 +673,7 @@ typedef struct CoerceToDomainValue Expr xpr; Oid typeId; /* type for substituted value */ int32 typeMod; /* typemod for substituted value */ -} CoerceToDomainValue; +} CoerceToDomainValue; /* * Placeholder node for a DEFAULT marker in an INSERT or UPDATE command. @@ -687,7 +687,7 @@ typedef struct SetToDefault Expr xpr; Oid typeId; /* type for substituted value */ int32 typeMod; /* typemod for substituted value */ -} SetToDefault; +} SetToDefault; /* * TargetEntry - diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index ca8166b472..d64b90459e 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: relation.h,v 1.84 2003/08/04 02:40:13 momjian Exp $ + * $Id: relation.h,v 1.85 2003/08/08 21:42:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,7 +43,7 @@ typedef struct QualCost { Cost startup; /* one-time cost */ Cost per_tuple; /* per-evaluation cost */ -} QualCost; +} QualCost; /*---------- * RelOptInfo @@ -415,7 +415,7 @@ typedef struct ResultPath Path path; Path *subpath; List *constantqual; -} ResultPath; +} ResultPath; /* * MaterialPath represents use of a Material plan node, i.e., caching of @@ -427,7 +427,7 @@ typedef struct MaterialPath { Path path; Path *subpath; -} MaterialPath; +} MaterialPath; /* * UniquePath represents elimination of distinct rows from the output of @@ -444,7 +444,7 @@ typedef struct UniquePath Path *subpath; bool use_hash; double rows; /* estimated number of result tuples */ -} UniquePath; +} UniquePath; /* * All join-type paths share these fields. @@ -690,7 +690,7 @@ typedef struct InnerIndexscanInfo bool isouterjoin; /* true if join is outer */ /* Best path for this lookup key: */ Path *best_innerpath; /* best inner indexscan, or NULL if none */ -} InnerIndexscanInfo; +} InnerIndexscanInfo; /* * IN clause info. @@ -712,6 +712,6 @@ typedef struct InClauseInfo * Note: sub_targetlist is just a list of Vars or expressions; it does * not contain TargetEntry nodes. */ -} InClauseInfo; +} InClauseInfo; #endif /* RELATION_H */ diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index 7d25a2fd5a..914714e65c 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: clauses.h,v 1.67 2003/08/04 02:40:13 momjian Exp $ + * $Id: clauses.h,v 1.68 2003/08/08 21:42:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,7 +60,7 @@ extern bool has_distinct_on_clause(Query *query); extern void clause_get_relids_vars(Node *clause, Relids *relids, List **vars); extern int NumRelids(Node *clause); -extern void CommuteClause(OpExpr * clause); +extern void CommuteClause(OpExpr *clause); extern Node *eval_const_expressions(Node *node); diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index 93d5080ed4..5de317ddf4 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: cost.h,v 1.56 2003/08/04 02:40:13 momjian Exp $ + * $Id: cost.h,v 1.57 2003/08/08 21:42:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,7 +75,7 @@ extern void cost_group(Path *path, Query *root, extern void cost_nestloop(NestPath *path, Query *root); extern void cost_mergejoin(MergePath *path, Query *root); extern void cost_hashjoin(HashPath *path, Query *root); -extern void cost_qual_eval(QualCost * cost, List *quals); +extern void cost_qual_eval(QualCost *cost, List *quals); extern void set_baserel_size_estimates(Query *root, RelOptInfo *rel); extern void set_joinrel_size_estimates(Query *root, RelOptInfo *rel, RelOptInfo *outer_rel, diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index fc54ac8a6a..a27cc9ebc6 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: planmain.h,v 1.74 2003/08/04 02:40:14 momjian Exp $ + * $Id: planmain.h,v 1.75 2003/08/08 21:42:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -69,6 +69,6 @@ extern void process_implied_equality(Query *root, */ extern void set_plan_references(Plan *plan, List *rtable); extern void fix_opfuncids(Node *node); -extern void set_opfuncid(OpExpr * opexpr); +extern void set_opfuncid(OpExpr *opexpr); #endif /* PLANMAIN_H */ diff --git a/src/include/port.h b/src/include/port.h index b27b885638..4ff6710c30 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: port.h,v 1.11 2003/08/08 04:52:22 momjian Exp $ + * $Id: port.h,v 1.12 2003/08/08 21:42:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,16 +18,16 @@ #endif /* Portable path handling for Unix/Win32 */ -extern bool is_absolute_path(const char *filename); -extern char *first_path_separator(const char *filename); -extern char *last_path_separator(const char *filename); -extern char *get_progname(char *argv0); +extern bool is_absolute_path(const char *filename); +extern char *first_path_separator(const char *filename); +extern char *last_path_separator(const char *filename); +extern char *get_progname(char *argv0); extern char *simple_prompt(const char *prompt, int maxlen, bool echo); #if defined(bsdi) || defined(netbsd) -extern int fseeko(FILE *stream, off_t offset, int whence); -extern off_t ftello(FILE *stream); +extern int fseeko(FILE *stream, off_t offset, int whence); +extern off_t ftello(FILE *stream); #endif #ifdef WIN32 @@ -35,8 +35,8 @@ extern off_t ftello(FILE *stream); * Win32 doesn't have reliable rename/unlink during concurrent access */ #ifndef FRONTEND -extern int pgrename(const char *from, const char *to); -extern int pgunlink(const char *path); +extern int pgrename(const char *from, const char *to); +extern int pgunlink(const char *path); #define rename(from, to) pgrename(from, to) #define unlink(path) pgunlink(path) diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h index 86ea386dce..2f8c994603 100644 --- a/src/include/regex/regex.h +++ b/src/include/regex/regex.h @@ -29,7 +29,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: regex.h,v 1.24 2003/08/04 00:43:32 momjian Exp $ + * $Id: regex.h,v 1.25 2003/08/08 21:42:51 momjian Exp $ */ /* @@ -89,7 +89,7 @@ typedef struct typedef struct { regmatch_t rm_extend; /* see REG_EXPECT */ -} rm_detail_t; +} rm_detail_t; diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h index 7d52bd855f..e83affd844 100644 --- a/src/include/storage/freespace.h +++ b/src/include/storage/freespace.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: freespace.h,v 1.12 2003/08/04 02:40:14 momjian Exp $ + * $Id: freespace.h,v 1.13 2003/08/08 21:42:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,7 +25,7 @@ typedef struct PageFreeSpaceInfo { BlockNumber blkno; /* which page in relation */ Size avail; /* space available on this page */ -} PageFreeSpaceInfo; +} PageFreeSpaceInfo; /* GUC variables */ @@ -47,7 +47,7 @@ extern BlockNumber RecordAndGetPageWithFreeSpace(RelFileNode *rel, extern Size GetAvgFSMRequestSize(RelFileNode *rel); extern void RecordRelationFreeSpace(RelFileNode *rel, int nPages, - PageFreeSpaceInfo * pageSpaces); + PageFreeSpaceInfo *pageSpaces); extern BlockNumber GetFreeIndexPage(RelFileNode *rel); extern void RecordIndexFreeSpace(RelFileNode *rel, diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h index 70557d2c87..c22835fdfe 100644 --- a/src/include/tcop/dest.h +++ b/src/include/tcop/dest.h @@ -54,7 +54,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dest.h,v 1.41 2003/08/06 17:46:46 tgl Exp $ + * $Id: dest.h,v 1.42 2003/08/08 21:42:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -108,8 +108,8 @@ struct _DestReceiver DestReceiver *self); /* Per-executor-run initialization and shutdown: */ void (*rStartup) (DestReceiver *self, - int operation, - TupleDesc typeinfo); + int operation, + TupleDesc typeinfo); void (*rShutdown) (DestReceiver *self); /* Destroy the receiver object itself (if dynamically allocated) */ void (*rDestroy) (DestReceiver *self); diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index 332790f3c1..59b5d106fa 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: acl.h,v 1.60 2003/08/04 02:40:15 momjian Exp $ + * $Id: acl.h,v 1.61 2003/08/08 21:42:55 momjian Exp $ * * NOTES * For backward-compatibility purposes we have to allow there @@ -190,7 +190,7 @@ typedef enum AclObjectKind ACL_KIND_OPCLASS, /* pg_opclass */ ACL_KIND_CONVERSION, /* pg_conversion */ MAX_ACL_KIND /* MUST BE LAST */ -} AclObjectKind; +} AclObjectKind; /* * routines used internally diff --git a/src/include/utils/array.h b/src/include/utils/array.h index f6c73dd2bd..f37a8e117e 100644 --- a/src/include/utils/array.h +++ b/src/include/utils/array.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: array.h,v 1.44 2003/08/04 02:40:15 momjian Exp $ + * $Id: array.h,v 1.45 2003/08/08 21:42:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,7 +47,7 @@ typedef struct ArrayBuildState int16 typlen; /* needed info about datatype */ bool typbyval; char typalign; -} ArrayBuildState; +} ArrayBuildState; /* * structure to cache type metadata needed for array manipulation @@ -62,7 +62,7 @@ typedef struct ArrayMetaState Oid typelem; Oid typiofunc; FmgrInfo proc; -} ArrayMetaState; +} ArrayMetaState; /* * fmgr macros for array objects @@ -160,13 +160,13 @@ extern void deconstruct_array(ArrayType *array, Oid elmtype, int elmlen, bool elmbyval, char elmalign, Datum **elemsp, int *nelemsp); -extern ArrayBuildState *accumArrayResult(ArrayBuildState * astate, +extern ArrayBuildState *accumArrayResult(ArrayBuildState *astate, Datum dvalue, bool disnull, Oid element_type, MemoryContext rcontext); -extern Datum makeArrayResult(ArrayBuildState * astate, +extern Datum makeArrayResult(ArrayBuildState *astate, MemoryContext rcontext); -extern Datum makeMdArrayResult(ArrayBuildState * astate, int ndims, +extern Datum makeMdArrayResult(ArrayBuildState *astate, int ndims, int *dims, int *lbs, MemoryContext rcontext); /* diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index a552a3d3d5..a84f851225 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.226 2003/08/04 02:40:15 momjian Exp $ + * $Id: builtins.h,v 1.227 2003/08/08 21:42:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -614,7 +614,7 @@ extern Datum ltrim1(PG_FUNCTION_ARGS); extern Datum rtrim(PG_FUNCTION_ARGS); extern Datum rtrim1(PG_FUNCTION_ARGS); extern Datum translate(PG_FUNCTION_ARGS); -extern Datum chr(PG_FUNCTION_ARGS); +extern Datum chr (PG_FUNCTION_ARGS); extern Datum repeat(PG_FUNCTION_ARGS); extern Datum ascii(PG_FUNCTION_ARGS); diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index ee0da125e8..1a737b7f6d 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: elog.h,v 1.62 2003/08/04 02:40:15 momjian Exp $ + * $Id: elog.h,v 1.63 2003/08/08 21:42:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -154,7 +154,7 @@ typedef struct ErrorContextCallback struct ErrorContextCallback *previous; void (*callback) (void *arg); void *arg; -} ErrorContextCallback; +} ErrorContextCallback; extern DLLIMPORT ErrorContextCallback *error_context_stack; @@ -166,7 +166,7 @@ typedef enum PGERROR_TERSE, /* single-line error messages */ PGERROR_DEFAULT, /* recommended style */ PGERROR_VERBOSE /* all the facts, ma'am */ -} PGErrorVerbosity; +} PGErrorVerbosity; extern PGErrorVerbosity Log_error_verbosity; extern bool Log_timestamp; diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index 550a14efe7..c94e78eb49 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lsyscache.h,v 1.78 2003/08/04 02:40:15 momjian Exp $ + * $Id: lsyscache.h,v 1.79 2003/08/08 21:42:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,7 @@ typedef enum IOFuncSelector IOFunc_output, IOFunc_receive, IOFunc_send -} IOFuncSelector; +} IOFuncSelector; extern bool op_in_opclass(Oid opno, Oid opclass); extern bool op_requires_recheck(Oid opno, Oid opclass); diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 52d38c9ff3..3faf3ec562 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -39,7 +39,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: portal.h,v 1.46 2003/08/04 02:40:15 momjian Exp $ + * $Id: portal.h,v 1.47 2003/08/08 21:42:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -77,7 +77,7 @@ typedef enum PortalStrategy PORTAL_ONE_SELECT, PORTAL_UTIL_SELECT, PORTAL_MULTI_QUERY -} PortalStrategy; +} PortalStrategy; /* * Note: typedef Portal is declared in tcop/dest.h as |
