diff options
Diffstat (limited to 'src/include')
122 files changed, 1473 insertions, 1341 deletions
diff --git a/src/include/access/genam.h b/src/include/access/genam.h index 934defb8a7b..ac61ec35ac7 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: genam.h,v 1.40 2003/07/27 17:10:06 tgl Exp $ + * $Id: genam.h,v 1.41 2003/08/04 00:43:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,8 +34,8 @@ typedef struct IndexBulkDeleteResult BlockNumber num_pages; /* pages remaining in index */ double num_index_tuples; /* tuples remaining */ double tuples_removed; /* # removed by bulk-delete operation */ - BlockNumber pages_deleted; /* # unused pages in index */ - BlockNumber pages_free; /* # pages available for reuse */ + BlockNumber pages_deleted; /* # unused pages in index */ + BlockNumber pages_free; /* # pages available for reuse */ } IndexBulkDeleteResult; /* Typedef for callback function to determine if a tuple is bulk-deletable */ @@ -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,8 +89,8 @@ extern IndexBulkDeleteResult *index_bulk_delete(Relation indexRelation, IndexBulkDeleteCallback callback, void *callback_state); extern IndexBulkDeleteResult *index_vacuum_cleanup(Relation indexRelation, - IndexVacuumCleanupInfo *info, - IndexBulkDeleteResult *stats); + IndexVacuumCleanupInfo * info, + IndexBulkDeleteResult *stats); extern RegProcedure index_cost_estimator(Relation indexRelation); extern RegProcedure index_getprocid(Relation irel, AttrNumber attnum, uint16 procnum); diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index 06a0772bba8..b6df7220860 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.81 2003/02/23 20:32:12 tgl Exp $ + * $Id: heapam.h,v 1.82 2003/08/04 00:43:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -173,7 +173,7 @@ extern void heap_redo(XLogRecPtr lsn, XLogRecord *rptr); extern void heap_undo(XLogRecPtr lsn, XLogRecord *rptr); extern void heap_desc(char *buf, uint8 xl_info, char *rec); extern XLogRecPtr log_heap_clean(Relation reln, Buffer buffer, - OffsetNumber *unused, int uncnt); + OffsetNumber *unused, int uncnt); extern XLogRecPtr log_heap_move(Relation reln, Buffer oldbuf, ItemPointerData from, Buffer newbuf, HeapTuple newtup); diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index d6ea70cd7d1..28b19c50dcc 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nbtree.h,v 1.67 2003/02/23 22:43:09 tgl Exp $ + * $Id: nbtree.h,v 1.68 2003/08/04 00:43:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,7 @@ * a search has navigated to the wrong page due to concurrent page splits * or deletions; see src/backend/access/nbtree/README for more info. * - * In addition, we store the page's btree level (counting upwards from + * In addition, we store the page's btree level (counting upwards from * zero at a leaf page) as well as some flag bits indicating the page type * and status. If the page is deleted, we replace the level with the * next-transaction-ID value indicating when it is safe to reclaim the page. @@ -41,9 +41,9 @@ typedef struct BTPageOpaqueData BlockNumber btpo_next; /* right sibling, or P_NONE if rightmost */ union { - uint32 level; /* tree level --- zero for leaf pages */ + uint32 level; /* tree level --- zero for leaf pages */ TransactionId xact; /* next transaction ID, if deleted */ - } btpo; + } btpo; uint16 btpo_flags; /* flag bits, see below */ } BTPageOpaqueData; @@ -185,15 +185,16 @@ typedef BTItemData *BTItem; * record xl_info field */ #define XLOG_BTREE_INSERT_LEAF 0x00 /* add btitem without split */ -#define XLOG_BTREE_INSERT_UPPER 0x10 /* same, on a non-leaf page */ +#define XLOG_BTREE_INSERT_UPPER 0x10 /* same, on a non-leaf page */ #define XLOG_BTREE_INSERT_META 0x20 /* same, plus update metapage */ #define XLOG_BTREE_SPLIT_L 0x30 /* add btitem with split */ #define XLOG_BTREE_SPLIT_R 0x40 /* as above, new item on right */ -#define XLOG_BTREE_SPLIT_L_ROOT 0x50 /* add btitem with split of root */ -#define XLOG_BTREE_SPLIT_R_ROOT 0x60 /* as above, new item on right */ +#define XLOG_BTREE_SPLIT_L_ROOT 0x50 /* add btitem with split of root */ +#define XLOG_BTREE_SPLIT_R_ROOT 0x60 /* as above, new item on right */ #define XLOG_BTREE_DELETE 0x70 /* delete leaf btitem */ #define XLOG_BTREE_DELETE_PAGE 0x80 /* delete an entire page */ -#define XLOG_BTREE_DELETE_PAGE_META 0x90 /* same, plus update metapage */ +#define XLOG_BTREE_DELETE_PAGE_META 0x90 /* same, plus update + * metapage */ #define XLOG_BTREE_NEWROOT 0xA0 /* new root page */ #define XLOG_BTREE_NEWMETA 0xB0 /* update metadata page */ #define XLOG_BTREE_NEWPAGE 0xC0 /* new index page during build */ @@ -216,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. @@ -245,7 +246,7 @@ typedef struct xl_btree_insert * left or right split page (and thus, whether otherblk is the right or left * page of the split pair). The _ROOT variants indicate that we are splitting * the root page, and thus that a newroot record rather than an insert or - * split record should follow. Note that a split record never carries a + * split record should follow. Note that a split record never carries a * metapage update --- we'll do that in the parent-level update. */ typedef struct xl_btree_split @@ -279,7 +280,7 @@ typedef struct xl_btree_delete /* * This is what we need to know about deletion of a btree page. The target * identifies the tuple removed from the parent page (note that we remove - * this tuple's downlink and the *following* tuple's key). Note we do not + * this tuple's downlink and the *following* tuple's key). Note we do not * store any content for the deleted page --- it is just rewritten as empty * during recovery. */ @@ -290,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)) @@ -320,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)) @@ -332,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)) @@ -442,7 +443,7 @@ extern InsertIndexResult _bt_doinsert(Relation rel, BTItem btitem, bool index_is_unique, Relation heapRel); extern Buffer _bt_getstackbuf(Relation rel, BTStack stack, int access); extern void _bt_insert_parent(Relation rel, Buffer buf, Buffer rbuf, - BTStack stack, bool is_root, bool is_only); + BTStack stack, bool is_root, bool is_only); /* * prototypes for functions in nbtpage.c @@ -458,7 +459,7 @@ extern void _bt_pageinit(Page page, Size size); extern bool _bt_page_recyclable(Page page); extern void _bt_metaproot(Relation rel, BlockNumber rootbknum, uint32 level); extern void _bt_delitems(Relation rel, Buffer buf, - OffsetNumber *itemnos, int nitems); + OffsetNumber *itemnos, int nitems); extern int _bt_pagedel(Relation rel, Buffer buf, bool vacuum_full); /* diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h index 981b0f26483..69a446d657e 100644 --- a/src/include/access/printtup.h +++ b/src/include/access/printtup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: printtup.h,v 1.27 2003/05/08 18:16:37 tgl Exp $ + * $Id: printtup.h,v 1.28 2003/08/04 00:43:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,16 +19,16 @@ extern DestReceiver *printtup_create_DR(CommandDest dest, Portal portal); extern void SendRowDescriptionMessage(TupleDesc typeinfo, List *targetlist, - int16 *formats); + int16 *formats); extern void debugStartup(DestReceiver *self, int operation, - TupleDesc typeinfo); + TupleDesc typeinfo); extern void debugtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self); /* XXX these are really in executor/spi.c */ extern void spi_dest_startup(DestReceiver *self, int operation, - TupleDesc typeinfo); + TupleDesc typeinfo); extern void spi_printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self); diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index 898afa64bb5..16752485445 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: relscan.h,v 1.30 2003/01/08 19:41:40 tgl Exp $ + * $Id: relscan.h,v 1.31 2003/08/04 00:43:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,8 +76,8 @@ typedef struct IndexScanDescData * the logical scan position for itself. It does that using * unique_tuple_pos: -1 = before row, 0 = on row, +1 = after row. */ - int unique_tuple_pos; /* logical position */ - int unique_tuple_mark; /* logical marked position */ + int unique_tuple_pos; /* logical position */ + int unique_tuple_mark; /* logical marked position */ PgStat_Info xs_pgstat_info; /* statistics collector hook */ } IndexScanDescData; diff --git a/src/include/access/slru.h b/src/include/access/slru.h index 1386d7e2013..6a8b63a3ff6 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.1 2003/06/11 22:37:46 momjian Exp $ + * $Id: slru.h,v 1.2 2003/08/04 00:43:30 momjian Exp $ */ #ifndef SLRU_H #define SLRU_H @@ -18,42 +18,42 @@ typedef struct SlruLockData { - LWLockId ControlLock; + LWLockId ControlLock; /* * BufferLocks is set during CLOGShmemInit and does not change thereafter. * The value is automatically inherited by backends via fork, and * doesn't need to be in shared memory. */ - LWLockId BufferLocks[NUM_CLOG_BUFFERS]; /* Per-buffer I/O locks */ -} SlruLockData; + LWLockId BufferLocks[NUM_CLOG_BUFFERS]; /* Per-buffer I/O locks */ +} SlruLockData; typedef SlruLockData *SlruLock; typedef struct SlruCtlData { - void *shared; /* pointer to SlruSharedData */ - SlruLock locks; + void *shared; /* pointer to SlruSharedData */ + SlruLock locks; /* * Dir is set during SimpleLruShmemInit and does not change thereafter. * The value is automatically inherited by backends via fork, and * doesn't need to be in shared memory. */ - char Dir[MAXPGPATH]; - + char Dir[MAXPGPATH]; + /* * Decide which of two page numbers is "older" for truncation purposes. * We need to use comparison of TransactionIds here in order to do the right * thing with wraparound XID arithmetic. */ - bool (*PagePrecedes)(int, int); + bool (*PagePrecedes) (int, int); -} SlruCtlData; +} SlruCtlData; typedef SlruCtlData *SlruCtl; extern int SimpleLruShmemSize(void); extern void SimpleLruInit(SlruCtl ctl, const char *name, const char *subdir); extern int SimpleLruZeroPage(SlruCtl ctl, int pageno); -extern char *SimpleLruReadPage(SlruCtl ctl, int pageno, TransactionId xid, bool forwrite); +extern char *SimpleLruReadPage(SlruCtl ctl, int pageno, TransactionId xid, bool forwrite); extern void SimpleLruWritePage(SlruCtl ctl, int slotno); extern void SimpleLruSetLatestPage(SlruCtl ctl, int pageno); extern void SimpleLruFlush(SlruCtl ctl, bool checkpoint); diff --git a/src/include/access/xact.h b/src/include/access/xact.h index aa284df016f..4a8c5f67729 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xact.h,v 1.52 2003/05/14 03:26:03 tgl Exp $ + * $Id: xact.h,v 1.53 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,8 +31,8 @@ extern int DefaultXactIsoLevel; extern int XactIsoLevel; /* Xact read-only state */ -extern bool DefaultXactReadOnly; -extern bool XactReadOnly; +extern bool DefaultXactReadOnly; +extern bool XactReadOnly; /* * transaction states - transaction state from server perspective @@ -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 @@ -70,7 +70,7 @@ typedef struct TransactionStateData AbsoluteTime startTime; int startTimeUsec; TransState state; - TBlockState blockState; + TBlockState blockState; } TransactionStateData; typedef TransactionStateData *TransactionState; diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index cb2e6e523df..074e126abdb 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xlog.h,v 1.42 2003/02/22 00:45:05 tgl Exp $ + * $Id: xlog.h,v 1.43 2003/08/04 00:43:30 momjian Exp $ */ #ifndef XLOG_H #define XLOG_H @@ -58,7 +58,7 @@ typedef struct XLogRecord /* * If we backed up any disk blocks with the XLOG record, we use flag bits in * xl_info to signal it. We support backup of up to 3 disk blocks per XLOG - * record. (Could support 4 if we cared to dedicate all the xl_info bits for + * record. (Could support 4 if we cared to dedicate all the xl_info bits for * this purpose; currently bit 0 of xl_info is unused and available.) */ #define XLR_BKP_BLOCK_MASK 0x0E /* all info bits used for bkp diff --git a/src/include/c.h b/src/include/c.h index 3f6c23c6d14..f49978725d7 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.150 2003/06/12 08:15:29 momjian Exp $ + * $Id: c.h,v 1.151 2003/08/04 00:43:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,7 +68,7 @@ #include <sys/types.h> #include <errno.h> -#include <fcntl.h> /* ensure O_BINARY is available */ +#include <fcntl.h> /* ensure O_BINARY is available */ #ifdef HAVE_SUPPORTDEFS_H #include <SupportDefs.h> #endif @@ -591,7 +591,7 @@ typedef NameData *Name; * Exactly the same as standard library function memset(), but considerably * faster for zeroing small word-aligned structures (such as parsetree nodes). * This has to be a macro because the main point is to avoid function-call - * overhead. However, we have also found that the loop is faster than + * overhead. However, we have also found that the loop is faster than * native libc memset() on some platforms, even those with assembler * memset() functions. More research needs to be done, perhaps with * platform-specific MEMSET_LOOP_LIMIT values or tests in configure. @@ -707,6 +707,7 @@ typedef NameData *Name; #define FCNTL_NONBLOCK(sock) fcntl(sock, F_SETFL, O_NONBLOCK) #else extern long ioctlsocket_ret; + /* Returns non-0 on failure, while fcntl() returns -1 on failure */ #ifdef WIN32 #define FCNTL_NONBLOCK(sock) ((ioctlsocket(sock, FIONBIO, &ioctlsocket_ret) == 0) ? 0 : -1) @@ -754,7 +755,7 @@ extern int vsnprintf(char *str, size_t count, const char *fmt, va_list args); * because it is used in both the prototypes as well as the definitions. * Note also the long name. We expect that this won't collide with * other names causing compiler warnings. - */ + */ #ifndef SIGNAL_ARGS #define SIGNAL_ARGS int postgres_signal_arg @@ -766,25 +767,25 @@ extern int vsnprintf(char *str, size_t count, const char *fmt, va_list args); * that case. */ #ifndef HAVE_SIGSETJMP -# define sigjmp_buf jmp_buf -# define sigsetjmp(x,y) setjmp(x) -# define siglongjmp longjmp +#define sigjmp_buf jmp_buf +#define sigsetjmp(x,y) setjmp(x) +#define siglongjmp longjmp #endif #if defined(HAVE_FDATASYNC) && !HAVE_DECL_FDATASYNC -extern int fdatasync(int fildes); +extern int fdatasync(int fildes); #endif /* If strtoq() exists, rename it to the more standard strtoll() */ #if defined(HAVE_LONG_LONG_INT_64) && !defined(HAVE_STRTOLL) && defined(HAVE_STRTOQ) -# define strtoll strtoq -# define HAVE_STRTOLL 1 +#define strtoll strtoq +#define HAVE_STRTOLL 1 #endif /* If strtouq() exists, rename it to the more standard strtoull() */ #if defined(HAVE_LONG_LONG_INT_64) && !defined(HAVE_STRTOULL) && defined(HAVE_STRTOUQ) -# define strtoull strtouq -# define HAVE_STRTOULL 1 +#define strtoull strtouq +#define HAVE_STRTOULL 1 #endif /* /port compatibility functions */ diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 21ed3fbf90d..c8d9511a79c 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -4,7 +4,7 @@ * "Catalog version number" for PostgreSQL. * * The catalog version number is used to flag incompatible changes in - * the PostgreSQL system catalogs. Whenever anyone changes the format of + * the PostgreSQL system catalogs. Whenever anyone changes the format of * a system catalog relation, or adds, deletes, or modifies standard * catalog entries in such a way that an updated backend wouldn't work * with an old database (or vice versa), the catalog version number @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catversion.h,v 1.204 2003/07/30 22:56:24 tgl Exp $ + * $Id: catversion.h,v 1.205 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/dependency.h b/src/include/catalog/dependency.h index 512c17a43cf..b12ecb46665 100644 --- a/src/include/catalog/dependency.h +++ b/src/include/catalog/dependency.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dependency.h,v 1.8 2003/05/28 16:03:59 tgl Exp $ + * $Id: dependency.h,v 1.9 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -85,16 +85,16 @@ extern void performDeletion(const ObjectAddress *object, DropBehavior behavior); extern void deleteWhatDependsOn(const ObjectAddress *object, - bool showNotices); + bool showNotices); extern void recordDependencyOnExpr(const ObjectAddress *depender, Node *expr, List *rtable, DependencyType behavior); extern void recordDependencyOnSingleRelExpr(const ObjectAddress *depender, - Node *expr, Oid relId, - DependencyType behavior, - DependencyType self_behavior); + Node *expr, Oid relId, + DependencyType behavior, + DependencyType self_behavior); /* in pg_depend.c */ diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h index 5186d9ef5eb..40162386d86 100644 --- a/src/include/catalog/pg_am.h +++ b/src/include/catalog/pg_am.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_am.h,v 1.26 2003/06/22 22:04:55 tgl Exp $ + * $Id: pg_am.h,v 1.27 2003/08/04 00:43:30 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -58,7 +58,7 @@ CATALOG(pg_am) regproc amrestrpos; /* "restore marked scan position" function */ regproc ambuild; /* "build new index" function */ regproc ambulkdelete; /* bulk-delete function */ - regproc amvacuumcleanup; /* post-VACUUM cleanup function */ + regproc amvacuumcleanup; /* post-VACUUM cleanup function */ regproc amcostestimate; /* estimate cost of an indexscan */ } FormData_pg_am; diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h index 79f181cd695..15ec04c553c 100644 --- a/src/include/catalog/pg_amproc.h +++ b/src/include/catalog/pg_amproc.h @@ -14,7 +14,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_amproc.h,v 1.41 2003/06/27 00:33:25 tgl Exp $ + * $Id: pg_amproc.h,v 1.42 2003/08/04 00:43:30 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -78,7 +78,7 @@ DATA(insert ( 1993 3 199 )); /* btree */ -DATA(insert ( 397 1 382 )); +DATA(insert ( 397 1 382 )); DATA(insert ( 421 1 357 )); DATA(insert ( 423 1 1596 )); DATA(insert ( 424 1 1693 )); @@ -104,7 +104,7 @@ DATA(insert ( 1996 1 1107 )); DATA(insert ( 1998 1 1314 )); DATA(insert ( 2000 1 1358 )); DATA(insert ( 2002 1 1672 )); -DATA(insert ( 2003 1 360 )); +DATA(insert ( 2003 1 360 )); DATA(insert ( 2039 1 2045 )); DATA(insert ( 2095 1 2166 )); DATA(insert ( 2096 1 2166 )); @@ -134,16 +134,16 @@ DATA(insert ( 1999 1 452 )); DATA(insert ( 2001 1 1696 )); DATA(insert ( 2004 1 400 )); DATA(insert ( 2040 1 452 )); -DATA(insert ( 2222 1 454 )); -DATA(insert ( 2223 1 456 )); -DATA(insert ( 2224 1 398 )); -DATA(insert ( 2225 1 450 )); -DATA(insert ( 2226 1 450 )); -DATA(insert ( 2227 1 450 )); -DATA(insert ( 2228 1 450 )); -DATA(insert ( 2229 1 456 )); -DATA(insert ( 2230 1 456 )); -DATA(insert ( 2231 1 456 )); -DATA(insert ( 2232 1 455 )); +DATA(insert ( 2222 1 454 )); +DATA(insert ( 2223 1 456 )); +DATA(insert ( 2224 1 398 )); +DATA(insert ( 2225 1 450 )); +DATA(insert ( 2226 1 450 )); +DATA(insert ( 2227 1 450 )); +DATA(insert ( 2228 1 450 )); +DATA(insert ( 2229 1 456 )); +DATA(insert ( 2230 1 456 )); +DATA(insert ( 2231 1 456 )); +DATA(insert ( 2232 1 455 )); #endif /* PG_AMPROC_H */ diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index d20938f54a0..77df7446c84 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_attribute.h,v 1.102 2003/05/08 22:19:56 tgl Exp $ + * $Id: pg_attribute.h,v 1.103 2003/08/04 00:43:30 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -238,7 +238,7 @@ typedef FormData_pg_attribute *Form_pg_attribute; { 1247, {"typelem"}, 26, 0, 4, 10, 0, -1, -1, true, 'p', false, 'i', true, false, false, true, 0 }, \ { 1247, {"typinput"}, 24, 0, 4, 11, 0, -1, -1, true, 'p', false, 'i', true, false, false, true, 0 }, \ { 1247, {"typoutput"}, 24, 0, 4, 12, 0, -1, -1, true, 'p', false, 'i', true, false, false, true, 0 }, \ -{ 1247, {"typreceive"}, 24, 0, 4, 13, 0, -1, -1, true, 'p', false, 'i', true, false, false, true, 0 }, \ +{ 1247, {"typreceive"}, 24, 0, 4, 13, 0, -1, -1, true, 'p', false, 'i', true, false, false, true, 0 }, \ { 1247, {"typsend"}, 24, 0, 4, 14, 0, -1, -1, true, 'p', false, 'i', true, false, false, true, 0 }, \ { 1247, {"typalign"}, 18, 0, 1, 15, 0, -1, -1, true, 'p', false, 'c', true, false, false, true, 0 }, \ { 1247, {"typstorage"}, 18, 0, 1, 16, 0, -1, -1, true, 'p', false, 'c', true, false, false, true, 0 }, \ @@ -404,8 +404,8 @@ DATA(insert ( 1261 tableoid 26 0 4 -7 0 -1 -1 t p f i t f f t 0)); { 1249, {"attnotnull"}, 16, 0, 1, 14, 0, -1, -1, true, 'p', false, 'c', true, false, false, true, 0 }, \ { 1249, {"atthasdef"}, 16, 0, 1, 15, 0, -1, -1, true, 'p', false, 'c', true, false, false, true, 0 }, \ { 1249, {"attisdropped"}, 16, 0, 1, 16, 0, -1, -1, true, 'p', false, 'c', true, false, false, true, 0 }, \ -{ 1249, {"attislocal"}, 16, 0, 1, 17, 0, -1, -1, true, 'p', false, 'c', true, false, false, true, 0 }, \ -{ 1249, {"attinhcount"}, 23, 0, 4, 18, 0, -1, -1, true, 'p', false, 'i', true, false, false, true, 0 } +{ 1249, {"attislocal"}, 16, 0, 1, 17, 0, -1, -1, true, 'p', false, 'c', true, false, false, true, 0 }, \ +{ 1249, {"attinhcount"}, 23, 0, 4, 18, 0, -1, -1, true, 'p', false, 'i', true, false, false, true, 0 } DATA(insert ( 1249 attrelid 26 -1 4 1 0 -1 -1 t p f i t f f t 0)); DATA(insert ( 1249 attname 19 -1 NAMEDATALEN 2 0 -1 -1 f p f i t f f t 0)); diff --git a/src/include/catalog/pg_cast.h b/src/include/catalog/pg_cast.h index 6c3d47ba7f1..b37eecab75e 100644 --- a/src/include/catalog/pg_cast.h +++ b/src/include/catalog/pg_cast.h @@ -7,7 +7,7 @@ * * Copyright (c) 2002, PostgreSQL Global Development Group * - * $Id: pg_cast.h,v 1.7 2003/05/26 00:11:27 tgl Exp $ + * $Id: pg_cast.h,v 1.8 2003/08/04 00:43:30 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -39,8 +39,10 @@ typedef FormData_pg_cast *Form_pg_cast; typedef enum CoercionCodes { - COERCION_CODE_IMPLICIT = 'i', /* coercion in context of expression */ - COERCION_CODE_ASSIGNMENT = 'a', /* coercion in context of assignment */ + COERCION_CODE_IMPLICIT = 'i', /* coercion in context of + * expression */ + COERCION_CODE_ASSIGNMENT = 'a', /* coercion in context of + * assignment */ COERCION_CODE_EXPLICIT = 'e' /* explicit cast operation */ } CoercionCodes; @@ -67,7 +69,7 @@ typedef enum CoercionCodes */ DATA(insert ( 20 21 714 a )); DATA(insert ( 20 23 480 a )); -DATA(insert ( 20 700 652 i )); +DATA(insert ( 20 700 652 i )); DATA(insert ( 20 701 482 i )); DATA(insert ( 20 1700 1781 i )); DATA(insert ( 21 20 754 i )); @@ -235,10 +237,10 @@ DATA(insert ( 869 650 0 i )); DATA(insert ( 1560 1562 0 i )); DATA(insert ( 1562 1560 0 i )); /* Cross-category casts between bit and int4, int8 */ -DATA(insert ( 20 1560 2075 e )); -DATA(insert ( 23 1560 1683 e )); -DATA(insert ( 1560 20 2076 e )); -DATA(insert ( 1560 23 1684 e )); +DATA(insert ( 20 1560 2075 e )); +DATA(insert ( 23 1560 1683 e )); +DATA(insert ( 1560 20 2076 e )); +DATA(insert ( 1560 23 1684 e )); /* * Cross-category casts to and from TEXT diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h index ebbf96f6195..80868188a89 100644 --- a/src/include/catalog/pg_constraint.h +++ b/src/include/catalog/pg_constraint.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_constraint.h,v 1.6 2003/03/10 22:28:19 tgl Exp $ + * $Id: pg_constraint.h,v 1.7 2003/08/04 00:43:30 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -141,14 +141,15 @@ typedef FormData_pg_constraint *Form_pg_constraint; */ /* - * Used for constraint support functions where the + * Used for constraint support functions where the * and conrelid, contypid columns being looked up */ -typedef enum CONSTRAINTCATEGORY { +typedef enum CONSTRAINTCATEGORY +{ CONSTRAINT_RELATION, CONSTRAINT_DOMAIN, CONSTRAINT_ASSERTION -} CONSTRAINTCATEGORY; +} CONSTRAINTCATEGORY; /* * prototypes for functions in pg_constraint.c @@ -176,9 +177,9 @@ extern Oid CreateConstraintEntry(const char *constraintName, extern void RemoveConstraintById(Oid conId); extern bool ConstraintNameIsUsed(CONSTRAINTCATEGORY conCat, Oid objId, Oid objNamespace, - const char *cname); + const char *cname); extern char *GenerateConstraintName(CONSTRAINTCATEGORY conCat, Oid objId, Oid objNamespace, - int *counter); + int *counter); extern bool ConstraintNameIsGenerated(const char *cname); #endif /* PG_CONSTRAINT_H */ diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h index 5d635523ca9..4c1b78ac3f3 100644 --- a/src/include/catalog/pg_opclass.h +++ b/src/include/catalog/pg_opclass.h @@ -26,7 +26,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_opclass.h,v 1.54 2003/06/27 00:33:25 tgl Exp $ + * $Id: pg_opclass.h,v 1.55 2003/08/04 00:43:30 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -151,7 +151,7 @@ DATA(insert OID = 2039 ( 403 timestamp_ops PGNSP PGUID 1114 t 0 )); DATA(insert OID = 2040 ( 405 timestamp_ops PGNSP PGUID 1114 t 0 )); DATA(insert OID = 2095 ( 403 text_pattern_ops PGNSP PGUID 25 f 0 )); #define TEXT_PATTERN_BTREE_OPS_OID 2095 -DATA(insert OID = 2096 ( 403 varchar_pattern_ops PGNSP PGUID 1043 f 0 )); +DATA(insert OID = 2096 ( 403 varchar_pattern_ops PGNSP PGUID 1043 f 0 )); #define VARCHAR_PATTERN_BTREE_OPS_OID 2096 DATA(insert OID = 2097 ( 403 bpchar_pattern_ops PGNSP PGUID 1042 f 0 )); #define BPCHAR_PATTERN_BTREE_OPS_OID 2097 @@ -165,7 +165,7 @@ DATA(insert OID = 2226 ( 405 cid_ops PGNSP PGUID 29 t 0 )); DATA(insert OID = 2227 ( 405 abstime_ops PGNSP PGUID 702 t 0 )); DATA(insert OID = 2228 ( 405 reltime_ops PGNSP PGUID 703 t 0 )); DATA(insert OID = 2229 ( 405 text_pattern_ops PGNSP PGUID 25 f 0 )); -DATA(insert OID = 2230 ( 405 varchar_pattern_ops PGNSP PGUID 1043 f 0 )); +DATA(insert OID = 2230 ( 405 varchar_pattern_ops PGNSP PGUID 1043 f 0 )); DATA(insert OID = 2231 ( 405 bpchar_pattern_ops PGNSP PGUID 1042 f 0 )); DATA(insert OID = 2232 ( 405 name_pattern_ops PGNSP PGUID 19 f 0 )); diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h index a964ac1b3dd..85cce6db391 100644 --- a/src/include/catalog/pg_operator.h +++ b/src/include/catalog/pg_operator.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_operator.h,v 1.118 2003/06/27 00:33:25 tgl Exp $ + * $Id: pg_operator.h,v 1.119 2003/08/04 00:43:30 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -116,9 +116,9 @@ DATA(insert OID = 96 ( "=" PGNSP PGUID b t 23 23 16 96 518 97 97 97 521 int DATA(insert OID = 97 ( "<" PGNSP PGUID b f 23 23 16 521 525 0 0 0 0 int4lt scalarltsel scalarltjoinsel )); DATA(insert OID = 98 ( "=" PGNSP PGUID b t 25 25 16 98 531 664 664 664 666 texteq eqsel eqjoinsel )); -DATA(insert OID = 349 ( "||" PGNSP PGUID b f 2277 2283 2277 0 0 0 0 0 0 array_append - - )); -DATA(insert OID = 374 ( "||" PGNSP PGUID b f 2283 2277 2277 0 0 0 0 0 0 array_prepend - - )); -DATA(insert OID = 375 ( "||" PGNSP PGUID b f 2277 2277 2277 0 0 0 0 0 0 array_cat - - )); +DATA(insert OID = 349 ( "||" PGNSP PGUID b f 2277 2283 2277 0 0 0 0 0 0 array_append - - )); +DATA(insert OID = 374 ( "||" PGNSP PGUID b f 2283 2277 2277 0 0 0 0 0 0 array_prepend - - )); +DATA(insert OID = 375 ( "||" PGNSP PGUID b f 2277 2277 2277 0 0 0 0 0 0 array_cat - - )); DATA(insert OID = 352 ( "=" PGNSP PGUID b t 28 28 16 352 0 0 0 0 0 xideq eqsel eqjoinsel )); DATA(insert OID = 353 ( "=" PGNSP PGUID b f 28 23 16 0 0 0 0 0 0 xideqint4 eqsel eqjoinsel )); @@ -351,7 +351,7 @@ DATA(insert OID = 708 ( "<->" PGNSP PGUID b f 628 628 701 708 0 0 0 0 DATA(insert OID = 709 ( "<->" PGNSP PGUID b f 601 601 701 709 0 0 0 0 0 lseg_distance - - )); DATA(insert OID = 712 ( "<->" PGNSP PGUID b f 604 604 701 712 0 0 0 0 0 poly_distance - - )); -DATA(insert OID = 713 ( "<>" PGNSP PGUID b f 600 600 16 713 510 0 0 0 0 point_ne neqsel neqjoinsel )); +DATA(insert OID = 713 ( "<>" PGNSP PGUID b f 600 600 16 713 510 0 0 0 0 point_ne neqsel neqjoinsel )); /* add translation/rotation/scaling operators for geometric types. - thomas 97/05/10 */ DATA(insert OID = 731 ( "+" PGNSP PGUID b f 600 600 600 731 0 0 0 0 0 point_add - - )); @@ -443,10 +443,10 @@ DATA(insert OID = 1061 ( ">=" PGNSP PGUID b f 1042 1042 16 1059 1058 0 0 0 /* generic array comparison operators */ DATA(insert OID = 1070 ( "=" PGNSP PGUID b f 2277 2277 16 1070 1071 1072 1072 1072 1073 array_eq eqsel eqjoinsel )); -#define ARRAY_EQ_OP 1070 +#define ARRAY_EQ_OP 1070 DATA(insert OID = 1071 ( "<>" PGNSP PGUID b f 2277 2277 16 1071 1070 0 0 0 0 array_ne neqsel neqjoinsel )); DATA(insert OID = 1072 ( "<" PGNSP PGUID b f 2277 2277 16 1073 1075 0 0 0 0 array_lt scalarltsel scalarltjoinsel )); -#define ARRAY_LT_OP 1072 +#define ARRAY_LT_OP 1072 DATA(insert OID = 1073 ( ">" PGNSP PGUID b f 2277 2277 16 1072 1074 0 0 0 0 array_gt scalargtsel scalargtjoinsel )); DATA(insert OID = 1074 ( "<=" PGNSP PGUID b f 2277 2277 16 1075 1073 0 0 0 0 array_le scalarltsel scalarltjoinsel )); DATA(insert OID = 1075 ( ">=" PGNSP PGUID b f 2277 2277 16 1074 1072 0 0 0 0 array_ge scalargtsel scalargtjoinsel )); @@ -801,25 +801,25 @@ DATA(insert OID = 2068 ( "-" PGNSP PGUID b f 1114 1186 1114 0 0 0 0 0 0 tim /* character-by-character (not collation order) comparison operators for character types */ DATA(insert OID = 2314 ( "~<~" PGNSP PGUID b f 25 25 16 2318 2317 0 0 0 0 text_pattern_lt scalarltsel scalarltjoinsel )); -DATA(insert OID = 2315 ( "~<=~" PGNSP PGUID b f 25 25 16 2317 2318 0 0 0 0 text_pattern_le scalarltsel scalarltjoinsel )); +DATA(insert OID = 2315 ( "~<=~" PGNSP PGUID b f 25 25 16 2317 2318 0 0 0 0 text_pattern_le scalarltsel scalarltjoinsel )); DATA(insert OID = 2316 ( "~=~" PGNSP PGUID b t 25 25 16 2316 2319 2314 2314 2314 2318 text_pattern_eq eqsel eqjoinsel )); -DATA(insert OID = 2317 ( "~>=~" PGNSP PGUID b f 25 25 16 2315 2314 0 0 0 0 text_pattern_ge scalargtsel scalargtjoinsel )); +DATA(insert OID = 2317 ( "~>=~" PGNSP PGUID b f 25 25 16 2315 2314 0 0 0 0 text_pattern_ge scalargtsel scalargtjoinsel )); DATA(insert OID = 2318 ( "~>~" PGNSP PGUID b f 25 25 16 2314 2315 0 0 0 0 text_pattern_gt scalargtsel scalargtjoinsel )); -DATA(insert OID = 2319 ( "~<>~" PGNSP PGUID b f 25 25 16 2319 2316 0 0 0 0 text_pattern_ne neqsel neqjoinsel )); +DATA(insert OID = 2319 ( "~<>~" PGNSP PGUID b f 25 25 16 2319 2316 0 0 0 0 text_pattern_ne neqsel neqjoinsel )); DATA(insert OID = 2326 ( "~<~" PGNSP PGUID b f 1042 1042 16 2330 2329 0 0 0 0 bpchar_pattern_lt scalarltsel scalarltjoinsel )); -DATA(insert OID = 2327 ( "~<=~" PGNSP PGUID b f 1042 1042 16 2329 2330 0 0 0 0 bpchar_pattern_le scalarltsel scalarltjoinsel )); +DATA(insert OID = 2327 ( "~<=~" PGNSP PGUID b f 1042 1042 16 2329 2330 0 0 0 0 bpchar_pattern_le scalarltsel scalarltjoinsel )); DATA(insert OID = 2328 ( "~=~" PGNSP PGUID b t 1042 1042 16 2328 2331 2326 2326 2326 2330 bpchar_pattern_eq eqsel eqjoinsel )); -DATA(insert OID = 2329 ( "~>=~" PGNSP PGUID b f 1042 1042 16 2327 2326 0 0 0 0 bpchar_pattern_ge scalargtsel scalargtjoinsel )); +DATA(insert OID = 2329 ( "~>=~" PGNSP PGUID b f 1042 1042 16 2327 2326 0 0 0 0 bpchar_pattern_ge scalargtsel scalargtjoinsel )); DATA(insert OID = 2330 ( "~>~" PGNSP PGUID b f 1042 1042 16 2326 2327 0 0 0 0 bpchar_pattern_gt scalargtsel scalargtjoinsel )); -DATA(insert OID = 2331 ( "~<>~" PGNSP PGUID b f 1042 1042 16 2331 2328 0 0 0 0 bpchar_pattern_ne neqsel neqjoinsel )); +DATA(insert OID = 2331 ( "~<>~" PGNSP PGUID b f 1042 1042 16 2331 2328 0 0 0 0 bpchar_pattern_ne neqsel neqjoinsel )); DATA(insert OID = 2332 ( "~<~" PGNSP PGUID b f 19 19 16 2336 2335 0 0 0 0 name_pattern_lt scalarltsel scalarltjoinsel )); -DATA(insert OID = 2333 ( "~<=~" PGNSP PGUID b f 19 19 16 2335 2336 0 0 0 0 name_pattern_le scalarltsel scalarltjoinsel )); +DATA(insert OID = 2333 ( "~<=~" PGNSP PGUID b f 19 19 16 2335 2336 0 0 0 0 name_pattern_le scalarltsel scalarltjoinsel )); DATA(insert OID = 2334 ( "~=~" PGNSP PGUID b t 19 19 16 2334 2337 2332 2332 2332 2336 name_pattern_eq eqsel eqjoinsel )); -DATA(insert OID = 2335 ( "~>=~" PGNSP PGUID b f 19 19 16 2333 2332 0 0 0 0 name_pattern_ge scalargtsel scalargtjoinsel )); +DATA(insert OID = 2335 ( "~>=~" PGNSP PGUID b f 19 19 16 2333 2332 0 0 0 0 name_pattern_ge scalargtsel scalargtjoinsel )); DATA(insert OID = 2336 ( "~>~" PGNSP PGUID b f 19 19 16 2332 2333 0 0 0 0 name_pattern_gt scalargtsel scalargtjoinsel )); -DATA(insert OID = 2337 ( "~<>~" PGNSP PGUID b f 19 19 16 2337 2334 0 0 0 0 name_pattern_ne neqsel neqjoinsel )); +DATA(insert OID = 2337 ( "~<>~" PGNSP PGUID b f 19 19 16 2337 2334 0 0 0 0 name_pattern_ne neqsel neqjoinsel )); diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index e41817a0e3f..b81ad142e89 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_proc.h,v 1.310 2003/07/30 22:56:24 tgl Exp $ + * $Id: pg_proc.h,v 1.311 2003/08/04 00:43:30 momjian Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -844,7 +844,7 @@ DATA(insert OID = 456 ( hashvarlena PGNSP PGUID 12 f f t f i 1 23 "2281" has DESCR("hash any varlena type"); DATA(insert OID = 457 ( hashoidvector PGNSP PGUID 12 f f t f i 1 23 "30" hashoidvector - _null_ )); DESCR("hash"); -DATA(insert OID = 398 ( hashint2vector PGNSP PGUID 12 f f t f i 1 23 "22" hashint2vector - _null_ )); +DATA(insert OID = 398 ( hashint2vector PGNSP PGUID 12 f f t f i 1 23 "22" hashint2vector - _null_ )); DESCR("hash"); DATA(insert OID = 399 ( hashmacaddr PGNSP PGUID 12 f f t f i 1 23 "829" hashmacaddr - _null_ )); DESCR("hash"); @@ -931,9 +931,9 @@ DESCR("greater-than-or-equal"); DATA(insert OID = 659 ( namene PGNSP PGUID 12 f f t f i 2 16 "19 19" namene - _null_ )); DESCR("not equal"); -DATA(insert OID = 668 ( bpchar PGNSP PGUID 12 f f t f i 3 1042 "1042 23 16" bpchar - _null_ )); +DATA(insert OID = 668 ( bpchar PGNSP PGUID 12 f f t f i 3 1042 "1042 23 16" bpchar - _null_ )); DESCR("adjust char() to typmod length"); -DATA(insert OID = 669 ( varchar PGNSP PGUID 12 f f t f i 3 1043 "1043 23 16" varchar - _null_ )); +DATA(insert OID = 669 ( varchar PGNSP PGUID 12 f f t f i 3 1043 "1043 23 16" varchar - _null_ )); DESCR("adjust varchar() to typmod length"); DATA(insert OID = 676 ( mktinterval PGNSP PGUID 12 f f t f i 2 704 "702 702" mktinterval - _null_ )); @@ -1021,7 +1021,7 @@ DATA(insert OID = 378 ( array_append PGNSP PGUID 12 f f t f i 2 2277 "2277 2 DESCR("append element onto end of array"); DATA(insert OID = 379 ( array_prepend PGNSP PGUID 12 f f t f i 2 2277 "2283 2277" array_push - _null_ )); DESCR("prepend element onto front of array"); -DATA(insert OID = 383 ( array_cat PGNSP PGUID 12 f f t f i 2 2277 "2277 2277" array_cat - _null_ )); +DATA(insert OID = 383 ( array_cat PGNSP PGUID 12 f f t f i 2 2277 "2277 2277" array_cat - _null_ )); DESCR("concatenate two arrays"); DATA(insert OID = 384 ( array_coerce PGNSP PGUID 12 f f t f i 1 2277 "2277" array_type_coerce - _null_ )); DESCR("coerce array type to another array type"); @@ -1329,9 +1329,9 @@ DATA(insert OID = 1036 ( aclremove PGNSP PGUID 12 f f t f s 2 1034 "1034 10 DESCR("remove ACL item"); DATA(insert OID = 1037 ( aclcontains PGNSP PGUID 12 f f t f s 2 16 "1034 1033" aclcontains - _null_ )); DESCR("does ACL contain item?"); -DATA(insert OID = 1062 ( aclitemeq PGNSP PGUID 12 f f t f s 2 16 "1033 1033" aclitem_eq - _null_ )); +DATA(insert OID = 1062 ( aclitemeq PGNSP PGUID 12 f f t f s 2 16 "1033 1033" aclitem_eq - _null_ )); DESCR("equality operator for ACL items"); -DATA(insert OID = 1365 ( makeaclitem PGNSP PGUID 12 f f t f s 5 1033 "23 23 23 25 16" makeaclitem - _null_ )); +DATA(insert OID = 1365 ( makeaclitem PGNSP PGUID 12 f f t f s 5 1033 "23 23 23 25 16" makeaclitem - _null_ )); DESCR("make ACL item"); DATA(insert OID = 1038 ( seteval PGNSP PGUID 12 f f t t v 1 23 "26" seteval - _null_ )); DESCR("internal function supporting PostQuel-style sets"); @@ -1404,7 +1404,7 @@ DATA(insert OID = 1141 ( date_pli PGNSP PGUID 12 f f t f i 2 1082 "1082 23" DESCR("add"); DATA(insert OID = 1142 ( date_mii PGNSP PGUID 12 f f t f i 2 1082 "1082 23" date_mii - _null_ )); DESCR("subtract"); -DATA(insert OID = 1143 ( time_in PGNSP PGUID 12 f f t f s 3 1083 "2275 26 23" time_in - _null_ )); +DATA(insert OID = 1143 ( time_in PGNSP PGUID 12 f f t f s 3 1083 "2275 26 23" time_in - _null_ )); DESCR("I/O"); DATA(insert OID = 1144 ( time_out PGNSP PGUID 12 f f t f i 1 2275 "1083" time_out - _null_ )); DESCR("I/O"); @@ -1420,7 +1420,7 @@ DESCR("multiply"); DATA(insert OID = 1149 ( circle_div_pt PGNSP PGUID 12 f f t f i 2 718 "718 600" circle_div_pt - _null_ )); DESCR("divide"); -DATA(insert OID = 1150 ( timestamptz_in PGNSP PGUID 12 f f t f s 3 1184 "2275 26 23" timestamptz_in - _null_ )); +DATA(insert OID = 1150 ( timestamptz_in PGNSP PGUID 12 f f t f s 3 1184 "2275 26 23" timestamptz_in - _null_ )); DESCR("I/O"); DATA(insert OID = 1151 ( timestamptz_out PGNSP PGUID 12 f f t f s 1 2275 "1184" timestamptz_out - _null_ )); DESCR("I/O"); @@ -1439,7 +1439,7 @@ DESCR("greater-than"); DATA(insert OID = 1159 ( timezone PGNSP PGUID 12 f f t f s 2 1114 "25 1184" timestamptz_zone - _null_ )); DESCR("adjust timestamp to new time zone"); -DATA(insert OID = 1160 ( interval_in PGNSP PGUID 12 f f t f s 3 1186 "2275 26 23" interval_in - _null_ )); +DATA(insert OID = 1160 ( interval_in PGNSP PGUID 12 f f t f s 3 1186 "2275 26 23" interval_in - _null_ )); DESCR("I/O"); DATA(insert OID = 1161 ( interval_out PGNSP PGUID 12 f f t f i 1 2275 "1186" interval_out - _null_ )); DESCR("I/O"); @@ -1681,7 +1681,7 @@ DATA(insert OID = 1349 ( oidvectortypes PGNSP PGUID 12 f f t f s 1 25 "30" oi DESCR("print type names of oidvector field"); -DATA(insert OID = 1350 ( timetz_in PGNSP PGUID 12 f f t f s 3 1266 "2275 26 23" timetz_in - _null_ )); +DATA(insert OID = 1350 ( timetz_in PGNSP PGUID 12 f f t f s 3 1266 "2275 26 23" timetz_in - _null_ )); DESCR("I/O"); DATA(insert OID = 1351 ( timetz_out PGNSP PGUID 12 f f t f i 1 2275 "1266" timetz_out - _null_ )); DESCR("I/O"); @@ -2120,13 +2120,13 @@ DESCR("does not match LIKE expression, case-insensitive"); DATA(insert OID = 1637 ( like_escape PGNSP PGUID 12 f f t f i 2 25 "25 25" like_escape - _null_ )); DESCR("convert LIKE pattern to use backslash escapes"); -DATA(insert OID = 1656 ( bpcharicregexeq PGNSP PGUID 12 f f t f i 2 16 "1042 25" texticregexeq - _null_ )); +DATA(insert OID = 1656 ( bpcharicregexeq PGNSP PGUID 12 f f t f i 2 16 "1042 25" texticregexeq - _null_ )); DESCR("matches regex., case-insensitive"); -DATA(insert OID = 1657 ( bpcharicregexne PGNSP PGUID 12 f f t f i 2 16 "1042 25" texticregexne - _null_ )); +DATA(insert OID = 1657 ( bpcharicregexne PGNSP PGUID 12 f f t f i 2 16 "1042 25" texticregexne - _null_ )); DESCR("does not match regex., case-insensitive"); -DATA(insert OID = 1658 ( bpcharregexeq PGNSP PGUID 12 f f t f i 2 16 "1042 25" textregexeq - _null_ )); +DATA(insert OID = 1658 ( bpcharregexeq PGNSP PGUID 12 f f t f i 2 16 "1042 25" textregexeq - _null_ )); DESCR("matches regex., case-sensitive"); -DATA(insert OID = 1659 ( bpcharregexne PGNSP PGUID 12 f f t f i 2 16 "1042 25" textregexne - _null_ )); +DATA(insert OID = 1659 ( bpcharregexne PGNSP PGUID 12 f f t f i 2 16 "1042 25" textregexne - _null_ )); DESCR("does not match regex., case-sensitive"); DATA(insert OID = 1660 ( bpchariclike PGNSP PGUID 12 f f t f i 2 16 "1042 25" texticlike - _null_ )); DESCR("matches LIKE expression, case-insensitive"); @@ -2201,7 +2201,7 @@ DESCR("convert string with specified destination encoding name"); DATA(insert OID = 1813 ( convert PGNSP PGUID 12 f f t f s 3 25 "25 19 19" pg_convert2 - _null_ )); DESCR("convert string with specified encoding names"); -DATA(insert OID = 1619 ( convert_using PGNSP PGUID 12 f f t f s 2 25 "25 25" pg_convert_using - _null_ )); +DATA(insert OID = 1619 ( convert_using PGNSP PGUID 12 f f t f s 2 25 "25 25" pg_convert_using - _null_ )); DESCR("convert string with specified conversion name"); DATA(insert OID = 1264 ( pg_char_to_encoding PGNSP PGUID 12 f f t f s 1 23 "19" PG_char_to_encoding - _null_ )); @@ -2226,7 +2226,7 @@ DATA(insert OID = 1642 ( pg_get_userbyid PGNSP PGUID 12 f f t f s 1 19 "23" DESCR("user name by UID (with fallback)"); DATA(insert OID = 1643 ( pg_get_indexdef PGNSP PGUID 12 f f t f s 1 25 "26" pg_get_indexdef - _null_ )); DESCR("index description"); -DATA(insert OID = 1662 ( pg_get_triggerdef PGNSP PGUID 12 f f t f s 1 25 "26" pg_get_triggerdef - _null_ )); +DATA(insert OID = 1662 ( pg_get_triggerdef PGNSP PGUID 12 f f t f s 1 25 "26" pg_get_triggerdef - _null_ )); DESCR("trigger description"); DATA(insert OID = 1387 ( pg_get_constraintdef PGNSP PGUID 12 f f t f s 1 25 "26" pg_get_constraintdef - _null_ )); DESCR("constraint description"); @@ -2300,9 +2300,9 @@ DESCR("int4 to bitstring"); DATA(insert OID = 1684 ( int4 PGNSP PGUID 12 f f t f i 1 23 "1560" bittoint4 - _null_ )); DESCR("bitstring to int4"); -DATA(insert OID = 1685 ( bit PGNSP PGUID 12 f f t f i 3 1560 "1560 23 16" bit - _null_ )); +DATA(insert OID = 1685 ( bit PGNSP PGUID 12 f f t f i 3 1560 "1560 23 16" bit - _null_ )); DESCR("adjust bit() to typmod length"); -DATA(insert OID = 1687 ( varbit PGNSP PGUID 12 f f t f i 3 1562 "1562 23 16" varbit - _null_ )); +DATA(insert OID = 1687 ( varbit PGNSP PGUID 12 f f t f i 3 1562 "1562 23 16" varbit - _null_ )); DESCR("adjust varbit() to typmod length"); DATA(insert OID = 1698 ( position PGNSP PGUID 12 f f t f i 2 23 "1560 1560" bitposition - _null_ )); @@ -3042,29 +3042,29 @@ DATA(insert OID = 2157 ( stddev PGNSP PGUID 12 t f f f i 1 701 "700" aggrega DATA(insert OID = 2158 ( stddev PGNSP PGUID 12 t f f f i 1 701 "701" aggregate_dummy - _null_ )); DATA(insert OID = 2159 ( stddev PGNSP PGUID 12 t f f f i 1 1700 "1700" aggregate_dummy - _null_ )); -DATA(insert OID = 2160 ( text_pattern_lt PGNSP PGUID 12 f f t f i 2 16 "25 25" text_pattern_lt - _null_ )); -DATA(insert OID = 2161 ( text_pattern_le PGNSP PGUID 12 f f t f i 2 16 "25 25" text_pattern_le - _null_ )); -DATA(insert OID = 2162 ( text_pattern_eq PGNSP PGUID 12 f f t f i 2 16 "25 25" text_pattern_eq - _null_ )); -DATA(insert OID = 2163 ( text_pattern_ge PGNSP PGUID 12 f f t f i 2 16 "25 25" text_pattern_ge - _null_ )); -DATA(insert OID = 2164 ( text_pattern_gt PGNSP PGUID 12 f f t f i 2 16 "25 25" text_pattern_gt - _null_ )); -DATA(insert OID = 2165 ( text_pattern_ne PGNSP PGUID 12 f f t f i 2 16 "25 25" text_pattern_ne - _null_ )); +DATA(insert OID = 2160 ( text_pattern_lt PGNSP PGUID 12 f f t f i 2 16 "25 25" text_pattern_lt - _null_ )); +DATA(insert OID = 2161 ( text_pattern_le PGNSP PGUID 12 f f t f i 2 16 "25 25" text_pattern_le - _null_ )); +DATA(insert OID = 2162 ( text_pattern_eq PGNSP PGUID 12 f f t f i 2 16 "25 25" text_pattern_eq - _null_ )); +DATA(insert OID = 2163 ( text_pattern_ge PGNSP PGUID 12 f f t f i 2 16 "25 25" text_pattern_ge - _null_ )); +DATA(insert OID = 2164 ( text_pattern_gt PGNSP PGUID 12 f f t f i 2 16 "25 25" text_pattern_gt - _null_ )); +DATA(insert OID = 2165 ( text_pattern_ne PGNSP PGUID 12 f f t f i 2 16 "25 25" text_pattern_ne - _null_ )); DATA(insert OID = 2166 ( bttext_pattern_cmp PGNSP PGUID 12 f f t f i 2 23 "25 25" bttext_pattern_cmp - _null_ )); /* We use the same procedures here as above since the types are binary compatible. */ -DATA(insert OID = 2174 ( bpchar_pattern_lt PGNSP PGUID 12 f f t f i 2 16 "1042 1042" text_pattern_lt - _null_ )); -DATA(insert OID = 2175 ( bpchar_pattern_le PGNSP PGUID 12 f f t f i 2 16 "1042 1042" text_pattern_le - _null_ )); -DATA(insert OID = 2176 ( bpchar_pattern_eq PGNSP PGUID 12 f f t f i 2 16 "1042 1042" text_pattern_eq - _null_ )); -DATA(insert OID = 2177 ( bpchar_pattern_ge PGNSP PGUID 12 f f t f i 2 16 "1042 1042" text_pattern_ge - _null_ )); -DATA(insert OID = 2178 ( bpchar_pattern_gt PGNSP PGUID 12 f f t f i 2 16 "1042 1042" text_pattern_gt - _null_ )); -DATA(insert OID = 2179 ( bpchar_pattern_ne PGNSP PGUID 12 f f t f i 2 16 "1042 1042" text_pattern_ne - _null_ )); +DATA(insert OID = 2174 ( bpchar_pattern_lt PGNSP PGUID 12 f f t f i 2 16 "1042 1042" text_pattern_lt - _null_ )); +DATA(insert OID = 2175 ( bpchar_pattern_le PGNSP PGUID 12 f f t f i 2 16 "1042 1042" text_pattern_le - _null_ )); +DATA(insert OID = 2176 ( bpchar_pattern_eq PGNSP PGUID 12 f f t f i 2 16 "1042 1042" text_pattern_eq - _null_ )); +DATA(insert OID = 2177 ( bpchar_pattern_ge PGNSP PGUID 12 f f t f i 2 16 "1042 1042" text_pattern_ge - _null_ )); +DATA(insert OID = 2178 ( bpchar_pattern_gt PGNSP PGUID 12 f f t f i 2 16 "1042 1042" text_pattern_gt - _null_ )); +DATA(insert OID = 2179 ( bpchar_pattern_ne PGNSP PGUID 12 f f t f i 2 16 "1042 1042" text_pattern_ne - _null_ )); DATA(insert OID = 2180 ( btbpchar_pattern_cmp PGNSP PGUID 12 f f t f i 2 23 "1042 1042" bttext_pattern_cmp - _null_ )); -DATA(insert OID = 2181 ( name_pattern_lt PGNSP PGUID 12 f f t f i 2 16 "19 19" name_pattern_lt - _null_ )); -DATA(insert OID = 2182 ( name_pattern_le PGNSP PGUID 12 f f t f i 2 16 "19 19" name_pattern_le - _null_ )); -DATA(insert OID = 2183 ( name_pattern_eq PGNSP PGUID 12 f f t f i 2 16 "19 19" name_pattern_eq - _null_ )); -DATA(insert OID = 2184 ( name_pattern_ge PGNSP PGUID 12 f f t f i 2 16 "19 19" name_pattern_ge - _null_ )); -DATA(insert OID = 2185 ( name_pattern_gt PGNSP PGUID 12 f f t f i 2 16 "19 19" name_pattern_gt - _null_ )); -DATA(insert OID = 2186 ( name_pattern_ne PGNSP PGUID 12 f f t f i 2 16 "19 19" name_pattern_ne - _null_ )); +DATA(insert OID = 2181 ( name_pattern_lt PGNSP PGUID 12 f f t f i 2 16 "19 19" name_pattern_lt - _null_ )); +DATA(insert OID = 2182 ( name_pattern_le PGNSP PGUID 12 f f t f i 2 16 "19 19" name_pattern_le - _null_ )); +DATA(insert OID = 2183 ( name_pattern_eq PGNSP PGUID 12 f f t f i 2 16 "19 19" name_pattern_eq - _null_ )); +DATA(insert OID = 2184 ( name_pattern_ge PGNSP PGUID 12 f f t f i 2 16 "19 19" name_pattern_ge - _null_ )); +DATA(insert OID = 2185 ( name_pattern_gt PGNSP PGUID 12 f f t f i 2 16 "19 19" name_pattern_gt - _null_ )); +DATA(insert OID = 2186 ( name_pattern_ne PGNSP PGUID 12 f f t f i 2 16 "19 19" name_pattern_ne - _null_ )); DATA(insert OID = 2187 ( btname_pattern_cmp PGNSP PGUID 12 f f t f i 2 23 "19 19" btname_pattern_cmp - _null_ )); @@ -3198,7 +3198,7 @@ DESCR("calculates md5 hash"); DATA(insert OID = 2400 ( array_recv PGNSP PGUID 12 f f t f s 2 2277 "2281 26" array_recv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2401 ( array_send PGNSP PGUID 12 f f t f s 2 17 "2277 26" array_send - _null_ )); +DATA(insert OID = 2401 ( array_send PGNSP PGUID 12 f f t f s 2 17 "2277 26" array_send - _null_ )); DESCR("I/O"); DATA(insert OID = 2402 ( record_recv PGNSP PGUID 12 f f t f i 1 2249 "2281" record_recv - _null_ )); DESCR("I/O"); @@ -3230,7 +3230,7 @@ DATA(insert OID = 2415 ( textsend PGNSP PGUID 12 f f t f s 1 17 "25" text DESCR("I/O"); DATA(insert OID = 2416 ( unknownrecv PGNSP PGUID 12 f f t f i 1 705 "2281" unknownrecv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2417 ( unknownsend PGNSP PGUID 12 f f t f i 1 17 "705" unknownsend - _null_ )); +DATA(insert OID = 2417 ( unknownsend PGNSP PGUID 12 f f t f i 1 17 "705" unknownsend - _null_ )); DESCR("I/O"); DATA(insert OID = 2418 ( oidrecv PGNSP PGUID 12 f f t f i 1 26 "2281" oidrecv - _null_ )); DESCR("I/O"); @@ -3246,15 +3246,15 @@ DATA(insert OID = 2423 ( namesend PGNSP PGUID 12 f f t f s 1 17 "19" name DESCR("I/O"); DATA(insert OID = 2424 ( float4recv PGNSP PGUID 12 f f t f i 1 700 "2281" float4recv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2425 ( float4send PGNSP PGUID 12 f f t f i 1 17 "700" float4send - _null_ )); +DATA(insert OID = 2425 ( float4send PGNSP PGUID 12 f f t f i 1 17 "700" float4send - _null_ )); DESCR("I/O"); DATA(insert OID = 2426 ( float8recv PGNSP PGUID 12 f f t f i 1 701 "2281" float8recv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2427 ( float8send PGNSP PGUID 12 f f t f i 1 17 "701" float8send - _null_ )); +DATA(insert OID = 2427 ( float8send PGNSP PGUID 12 f f t f i 1 17 "701" float8send - _null_ )); DESCR("I/O"); DATA(insert OID = 2428 ( point_recv PGNSP PGUID 12 f f t f i 1 600 "2281" point_recv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2429 ( point_send PGNSP PGUID 12 f f t f i 1 17 "600" point_send - _null_ )); +DATA(insert OID = 2429 ( point_send PGNSP PGUID 12 f f t f i 1 17 "600" point_send - _null_ )); DESCR("I/O"); DATA(insert OID = 2430 ( bpcharrecv PGNSP PGUID 12 f f t f s 1 1042 "2281" bpcharrecv - _null_ )); DESCR("I/O"); @@ -3322,15 +3322,15 @@ DATA(insert OID = 2461 ( numeric_send PGNSP PGUID 12 f f t f i 1 17 "1700" DESCR("I/O"); DATA(insert OID = 2462 ( abstimerecv PGNSP PGUID 12 f f t f i 1 702 "2281" abstimerecv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2463 ( abstimesend PGNSP PGUID 12 f f t f i 1 17 "702" abstimesend - _null_ )); +DATA(insert OID = 2463 ( abstimesend PGNSP PGUID 12 f f t f i 1 17 "702" abstimesend - _null_ )); DESCR("I/O"); DATA(insert OID = 2464 ( reltimerecv PGNSP PGUID 12 f f t f i 1 703 "2281" reltimerecv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2465 ( reltimesend PGNSP PGUID 12 f f t f i 1 17 "703" reltimesend - _null_ )); +DATA(insert OID = 2465 ( reltimesend PGNSP PGUID 12 f f t f i 1 17 "703" reltimesend - _null_ )); DESCR("I/O"); DATA(insert OID = 2466 ( tintervalrecv PGNSP PGUID 12 f f t f i 1 704 "2281" tintervalrecv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2467 ( tintervalsend PGNSP PGUID 12 f f t f i 1 17 "704" tintervalsend - _null_ )); +DATA(insert OID = 2467 ( tintervalsend PGNSP PGUID 12 f f t f i 1 17 "704" tintervalsend - _null_ )); DESCR("I/O"); DATA(insert OID = 2468 ( date_recv PGNSP PGUID 12 f f t f i 1 1082 "2281" date_recv - _null_ )); DESCR("I/O"); @@ -3358,43 +3358,43 @@ DATA(insert OID = 2479 ( interval_send PGNSP PGUID 12 f f t f i 1 17 "1186" DESCR("I/O"); DATA(insert OID = 2480 ( lseg_recv PGNSP PGUID 12 f f t f i 1 601 "2281" lseg_recv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2481 ( lseg_send PGNSP PGUID 12 f f t f i 1 17 "601" lseg_send - _null_ )); +DATA(insert OID = 2481 ( lseg_send PGNSP PGUID 12 f f t f i 1 17 "601" lseg_send - _null_ )); DESCR("I/O"); DATA(insert OID = 2482 ( path_recv PGNSP PGUID 12 f f t f i 1 602 "2281" path_recv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2483 ( path_send PGNSP PGUID 12 f f t f i 1 17 "602" path_send - _null_ )); +DATA(insert OID = 2483 ( path_send PGNSP PGUID 12 f f t f i 1 17 "602" path_send - _null_ )); DESCR("I/O"); DATA(insert OID = 2484 ( box_recv PGNSP PGUID 12 f f t f i 1 603 "2281" box_recv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2485 ( box_send PGNSP PGUID 12 f f t f i 1 17 "603" box_send - _null_ )); +DATA(insert OID = 2485 ( box_send PGNSP PGUID 12 f f t f i 1 17 "603" box_send - _null_ )); DESCR("I/O"); DATA(insert OID = 2486 ( poly_recv PGNSP PGUID 12 f f t f i 1 604 "2281" poly_recv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2487 ( poly_send PGNSP PGUID 12 f f t f i 1 17 "604" poly_send - _null_ )); +DATA(insert OID = 2487 ( poly_send PGNSP PGUID 12 f f t f i 1 17 "604" poly_send - _null_ )); DESCR("I/O"); DATA(insert OID = 2488 ( line_recv PGNSP PGUID 12 f f t f i 1 628 "2281" line_recv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2489 ( line_send PGNSP PGUID 12 f f t f i 1 17 "628" line_send - _null_ )); +DATA(insert OID = 2489 ( line_send PGNSP PGUID 12 f f t f i 1 17 "628" line_send - _null_ )); DESCR("I/O"); DATA(insert OID = 2490 ( circle_recv PGNSP PGUID 12 f f t f i 1 718 "2281" circle_recv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2491 ( circle_send PGNSP PGUID 12 f f t f i 1 17 "718" circle_send - _null_ )); +DATA(insert OID = 2491 ( circle_send PGNSP PGUID 12 f f t f i 1 17 "718" circle_send - _null_ )); DESCR("I/O"); DATA(insert OID = 2492 ( cash_recv PGNSP PGUID 12 f f t f i 1 790 "2281" cash_recv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2493 ( cash_send PGNSP PGUID 12 f f t f i 1 17 "790" cash_send - _null_ )); +DATA(insert OID = 2493 ( cash_send PGNSP PGUID 12 f f t f i 1 17 "790" cash_send - _null_ )); DESCR("I/O"); DATA(insert OID = 2494 ( macaddr_recv PGNSP PGUID 12 f f t f i 1 829 "2281" macaddr_recv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2495 ( macaddr_send PGNSP PGUID 12 f f t f i 1 17 "829" macaddr_send - _null_ )); +DATA(insert OID = 2495 ( macaddr_send PGNSP PGUID 12 f f t f i 1 17 "829" macaddr_send - _null_ )); DESCR("I/O"); DATA(insert OID = 2496 ( inet_recv PGNSP PGUID 12 f f t f i 1 869 "2281" inet_recv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2497 ( inet_send PGNSP PGUID 12 f f t f i 1 17 "869" inet_send - _null_ )); +DATA(insert OID = 2497 ( inet_send PGNSP PGUID 12 f f t f i 1 17 "869" inet_send - _null_ )); DESCR("I/O"); DATA(insert OID = 2498 ( cidr_recv PGNSP PGUID 12 f f t f i 1 650 "2281" cidr_recv - _null_ )); DESCR("I/O"); -DATA(insert OID = 2499 ( cidr_send PGNSP PGUID 12 f f t f i 1 17 "650" cidr_send - _null_ )); +DATA(insert OID = 2499 ( cidr_send PGNSP PGUID 12 f f t f i 1 17 "650" cidr_send - _null_ )); DESCR("I/O"); DATA(insert OID = 2500 ( cstring_recv PGNSP PGUID 12 f f t f s 1 2275 "2281" cstring_recv - _null_ )); DESCR("I/O"); @@ -3416,7 +3416,7 @@ DATA(insert OID = 2507 ( pg_get_indexdef PGNSP PGUID 12 f f t f s 3 25 "26 2 DESCR("index description (full create statement or single expression) with pretty-print option"); DATA(insert OID = 2508 ( pg_get_constraintdef PGNSP PGUID 12 f f t f s 2 25 "26 16" pg_get_constraintdef_ext - _null_ )); DESCR("constraint description with pretty-print option"); -DATA(insert OID = 2509 ( pg_get_expr PGNSP PGUID 12 f f t f s 3 25 "25 26 16" pg_get_expr_ext - _null_ )); +DATA(insert OID = 2509 ( pg_get_expr PGNSP PGUID 12 f f t f s 3 25 "25 26 16" pg_get_expr_ext - _null_ )); DESCR("deparse an encoded expression with pretty-print option"); @@ -3453,6 +3453,6 @@ extern Oid ProcedureCreate(const char *procedureName, const Oid *parameterTypes); extern void check_sql_fn_retval(Oid rettype, char fn_typtype, - List *queryTreeList); + List *queryTreeList); #endif /* PG_PROC_H */ diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h index c72c68265db..b752bc9c60b 100644 --- a/src/include/catalog/pg_statistic.h +++ b/src/include/catalog/pg_statistic.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_statistic.h,v 1.20 2003/03/23 05:14:37 tgl Exp $ + * $Id: pg_statistic.h,v 1.21 2003/08/04 00:43:30 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -27,7 +27,7 @@ */ /* - * Keep C compiler happy with anyarray, below. This will need to go elsewhere + * Keep C compiler happy with anyarray, below. This will need to go elsewhere * if we ever use anyarray for more than pg_statistic. */ typedef struct varlena anyarray; @@ -116,8 +116,8 @@ CATALOG(pg_statistic) BKI_WITHOUT_OIDS /* * Values in these arrays are values of the column's data type. We - * presently have to cheat quite a bit to allow polymorphic arrays - * of this kind, but perhaps someday it'll be a less bogus facility. + * presently have to cheat quite a bit to allow polymorphic arrays of + * this kind, but perhaps someday it'll be a less bogus facility. */ anyarray stavalues1; anyarray stavalues2; diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index 2b4e51c4506..57e24bfc481 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_type.h,v 1.145 2003/05/13 18:03:08 tgl Exp $ + * $Id: pg_type.h,v 1.146 2003/08/04 00:43:30 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -164,9 +164,9 @@ CATALOG(pg_type) BOOTSTRAP int4 typtypmod; /* - * typndims is the declared number of dimensions for an array domain type - * (i.e., typbasetype is an array type; the domain's typelem will match - * the base type's typelem). Otherwise zero. + * typndims is the declared number of dimensions for an array domain + * type (i.e., typbasetype is an array type; the domain's typelem will + * match the base type's typelem). Otherwise zero. */ int4 typndims; @@ -545,7 +545,7 @@ DATA(insert OID = 2283 ( anyelement PGNSP PGUID 4 t p t \054 0 0 anyelement_in */ extern Oid TypeShellMake(const char *typeName, Oid typeNamespace); -extern Oid TypeCreate(const char *typeName, +extern Oid TypeCreate(const char *typeName, Oid typeNamespace, Oid assignedTypeOid, Oid relationOid, @@ -569,17 +569,17 @@ extern Oid TypeCreate(const char *typeName, bool typeNotNull); extern void GenerateTypeDependencies(Oid typeNamespace, - Oid typeObjectId, - Oid relationOid, - char relationKind, - Oid inputProcedure, - Oid outputProcedure, - Oid receiveProcedure, - Oid sendProcedure, - Oid elementType, - Oid baseType, - Node *defaultExpr, - bool rebuild); + Oid typeObjectId, + Oid relationOid, + char relationKind, + Oid inputProcedure, + Oid outputProcedure, + Oid receiveProcedure, + Oid sendProcedure, + Oid elementType, + Oid baseType, + Node *defaultExpr, + bool rebuild); extern void TypeRename(const char *oldTypeName, Oid typeNamespace, const char *newTypeName); diff --git a/src/include/commands/alter.h b/src/include/commands/alter.h index e3b59af1afd..68240e852d2 100644 --- a/src/include/commands/alter.h +++ b/src/include/commands/alter.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: alter.h,v 1.1 2003/06/27 14:45:31 petere Exp $ + * $Id: alter.h,v 1.2 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,4 @@ extern void ExecRenameStmt(RenameStmt *stmt); -#endif /* ALTER_H */ +#endif /* ALTER_H */ diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h index 037859973b5..5a3d91d2c41 100644 --- a/src/include/commands/dbcommands.h +++ b/src/include/commands/dbcommands.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dbcommands.h,v 1.27 2003/06/27 14:45:31 petere Exp $ + * $Id: dbcommands.h,v 1.28 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ extern void dropdb(const char *dbname); extern void RenameDatabase(const char *oldname, const char *newname); extern void AlterDatabaseSet(AlterDatabaseSetStmt *stmt); -extern Oid get_database_oid(const char *dbname); -extern char * get_database_name(Oid dbid); +extern Oid get_database_oid(const char *dbname); +extern char *get_database_name(Oid dbid); #endif /* DBCOMMANDS_H */ diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h index 69b2268920c..60391ea0e31 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $Id: explain.h,v 1.19 2003/05/06 20:26:27 tgl Exp $ + * $Id: explain.h,v 1.20 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,6 @@ extern void ExplainQuery(ExplainStmt *stmt, DestReceiver *dest); extern TupleDesc ExplainResultDesc(ExplainStmt *stmt); extern void ExplainOnePlan(QueryDesc *queryDesc, ExplainStmt *stmt, - TupOutputState *tstate); + TupOutputState *tstate); #endif /* EXPLAIN_H */ diff --git a/src/include/commands/portalcmds.h b/src/include/commands/portalcmds.h index ce874df6679..25cae460b9a 100644 --- a/src/include/commands/portalcmds.h +++ b/src/include/commands/portalcmds.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: portalcmds.h,v 1.10 2003/05/06 20:26:27 tgl Exp $ + * $Id: portalcmds.h,v 1.11 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,10 +17,10 @@ #include "utils/portal.h" -extern void PerformCursorOpen(DeclareCursorStmt *stmt); +extern void PerformCursorOpen(DeclareCursorStmt * stmt); extern void PerformPortalFetch(FetchStmt *stmt, DestReceiver *dest, - char *completionTag); + char *completionTag); extern void PerformPortalClose(const char *name); diff --git a/src/include/commands/prepare.h b/src/include/commands/prepare.h index 5b8f32dd4ca..ca6bbb4d93e 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.6 2003/05/06 21:51:42 tgl Exp $ + * $Id: prepare.h,v 1.7 2003/08/04 00:43:30 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 */ @@ -48,15 +48,15 @@ extern void ExplainExecuteQuery(ExplainStmt *stmt, TupOutputState *tstate); /* Low-level access to stored prepared statements */ extern void StorePreparedStatement(const char *stmt_name, - const char *query_string, - const char *commandTag, - List *query_list, - List *plan_list, - List *argtype_list); + const char *query_string, + const char *commandTag, + List *query_list, + List *plan_list, + List *argtype_list); extern PreparedStatement *FetchPreparedStatement(const char *stmt_name, - bool throwError); + 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 a0a18f0f330..3c4b6f1c4a7 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sequence.h,v 1.23 2003/03/20 07:02:11 momjian Exp $ + * $Id: sequence.h,v 1.24 2003/08/04 00:43:30 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/commands/trigger.h b/src/include/commands/trigger.h index e2aa280a2e0..1a2a33b3c24 100644 --- a/src/include/commands/trigger.h +++ b/src/include/commands/trigger.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: trigger.h,v 1.41 2003/03/27 14:33:11 tgl Exp $ + * $Id: trigger.h,v 1.42 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -117,9 +117,9 @@ extern TriggerDesc *CopyTriggerDesc(TriggerDesc *trigdesc); extern void FreeTriggerDesc(TriggerDesc *trigdesc); extern void ExecBSInsertTriggers(EState *estate, - ResultRelInfo *relinfo); + ResultRelInfo *relinfo); extern void ExecASInsertTriggers(EState *estate, - ResultRelInfo *relinfo); + ResultRelInfo *relinfo); extern HeapTuple ExecBRInsertTriggers(EState *estate, ResultRelInfo *relinfo, HeapTuple trigtuple); @@ -127,25 +127,25 @@ extern void ExecARInsertTriggers(EState *estate, ResultRelInfo *relinfo, HeapTuple trigtuple); extern void ExecBSDeleteTriggers(EState *estate, - ResultRelInfo *relinfo); + ResultRelInfo *relinfo); extern void ExecASDeleteTriggers(EState *estate, - ResultRelInfo *relinfo); + ResultRelInfo *relinfo); extern bool ExecBRDeleteTriggers(EState *estate, - ResultRelInfo *relinfo, - ItemPointer tupleid, - CommandId cid); + ResultRelInfo *relinfo, + ItemPointer tupleid, + CommandId cid); extern void ExecARDeleteTriggers(EState *estate, ResultRelInfo *relinfo, ItemPointer tupleid); extern void ExecBSUpdateTriggers(EState *estate, - ResultRelInfo *relinfo); + ResultRelInfo *relinfo); extern void ExecASUpdateTriggers(EState *estate, - ResultRelInfo *relinfo); + ResultRelInfo *relinfo); extern HeapTuple ExecBRUpdateTriggers(EState *estate, - ResultRelInfo *relinfo, - ItemPointer tupleid, - HeapTuple newtuple, - CommandId cid); + ResultRelInfo *relinfo, + ItemPointer tupleid, + HeapTuple newtuple, + CommandId cid); extern void ExecARUpdateTriggers(EState *estate, ResultRelInfo *relinfo, ItemPointer tupleid, diff --git a/src/include/commands/typecmds.h b/src/include/commands/typecmds.h index 0d2e319ed44..662fa73d937 100644 --- a/src/include/commands/typecmds.h +++ b/src/include/commands/typecmds.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: typecmds.h,v 1.5 2003/02/03 21:15:44 tgl Exp $ + * $Id: typecmds.h,v 1.6 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,7 @@ extern void AlterDomainDefault(List *names, Node *defaultRaw); extern void AlterDomainNotNull(List *names, bool notNull); extern void AlterDomainAddConstraint(List *names, Node *constr); extern void AlterDomainDropConstraint(List *names, const char *constrName, - DropBehavior behavior); + DropBehavior behavior); extern List *GetDomainConstraints(Oid typeOid); diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index 5eecb53b8d2..05e04c72eba 100644 --- a/src/include/executor/execdesc.h +++ b/src/include/executor/execdesc.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execdesc.h,v 1.24 2003/05/08 18:16:37 tgl Exp $ + * $Id: execdesc.h,v 1.25 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,9 +45,9 @@ typedef struct QueryDesc /* in pquery.c */ extern QueryDesc *CreateQueryDesc(Query *parsetree, Plan *plantree, - DestReceiver *dest, - ParamListInfo params, - bool doInstrument); + DestReceiver *dest, + ParamListInfo params, + bool doInstrument); extern void FreeQueryDesc(QueryDesc *qdesc); diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 741b99c75f2..d68289ffe06 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: executor.h,v 1.96 2003/07/21 17:05:10 tgl Exp $ + * $Id: executor.h,v 1.97 2003/08/04 00:43:30 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); @@ -48,31 +48,31 @@ extern bool execTuplesMatch(HeapTuple tuple1, FmgrInfo *eqfunctions, MemoryContext evalContext); extern bool execTuplesUnequal(HeapTuple tuple1, - HeapTuple tuple2, - TupleDesc tupdesc, - int numCols, - AttrNumber *matchColIdx, - FmgrInfo *eqfunctions, - MemoryContext evalContext); + HeapTuple tuple2, + TupleDesc tupdesc, + int numCols, + AttrNumber *matchColIdx, + FmgrInfo *eqfunctions, + MemoryContext evalContext); extern FmgrInfo *execTuplesMatchPrepare(TupleDesc tupdesc, int numCols, AttrNumber *matchColIdx); extern void execTuplesHashPrepare(TupleDesc tupdesc, - int numCols, - AttrNumber *matchColIdx, - FmgrInfo **eqfunctions, - FmgrInfo **hashfunctions); + int numCols, + AttrNumber *matchColIdx, + FmgrInfo **eqfunctions, + FmgrInfo **hashfunctions); extern TupleHashTable BuildTupleHashTable(int numCols, AttrNumber *keyColIdx, - FmgrInfo *eqfunctions, - FmgrInfo *hashfunctions, - int nbuckets, Size entrysize, - MemoryContext tablecxt, - MemoryContext tempcxt); + FmgrInfo *eqfunctions, + FmgrInfo *hashfunctions, + int nbuckets, Size entrysize, + MemoryContext tablecxt, + MemoryContext tempcxt); extern TupleHashEntry LookupTupleHashEntry(TupleHashTable hashtable, - TupleTableSlot *slot, - bool *isnew); + 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, - MemoryContext fcacheCxt); -extern Datum ExecMakeFunctionResult(FuncExprState *fcache, +extern void init_fcache(Oid foid, FuncExprState * fcache, + MemoryContext fcacheCxt); +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 { @@ -177,7 +177,7 @@ typedef struct TupOutputState } TupOutputState; extern TupOutputState *begin_tup_output_tupdesc(DestReceiver *dest, - TupleDesc tupdesc); + TupleDesc tupdesc); extern void do_tup_output(TupOutputState *tstate, char **values); extern void do_text_output_multiline(TupOutputState *tstate, char *text); extern void end_tup_output(TupOutputState *tstate); @@ -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, + ExprContext *econtext, + TupleTableSlot *slot); +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/hashjoin.h b/src/include/executor/hashjoin.h index da7e0bf98c4..1407e537813 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: hashjoin.h,v 1.28 2003/06/22 22:04:55 tgl Exp $ + * $Id: hashjoin.h,v 1.29 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -71,8 +71,9 @@ typedef struct HashTableData /* * Info about the datatype-specific hash functions for the datatypes * being hashed. We assume that the inner and outer sides of each - * hashclause are the same type, or at least share the same hash function. - * This is an array of the same length as the number of hash keys. + * hashclause are the same type, or at least share the same hash + * function. This is an array of the same length as the number of hash + * keys. */ FmgrInfo *hashfunctions; /* lookup data for hash functions */ diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index d6d7ea627ea..4f4359c23e3 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHash.h,v 1.30 2003/06/22 22:04:55 tgl Exp $ + * $Id: nodeHash.h,v 1.31 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,7 @@ extern void ExecHashTableInsert(HashJoinTable hashtable, extern int ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext, List *hashkeys); -extern int ExecHashGetBatch(int bucketno, HashJoinTable hashtable); +extern int ExecHashGetBatch(int bucketno, HashJoinTable hashtable); extern HeapTuple ExecScanHashBucket(HashJoinState *hjstate, List *hjclauses, ExprContext *econtext); extern void ExecHashTableReset(HashJoinTable hashtable, long ntuples); diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h index 683c4ab7dc9..593a2120a23 100644 --- a/src/include/executor/nodeSeqscan.h +++ b/src/include/executor/nodeSeqscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSeqscan.h,v 1.16 2002/12/05 15:50:38 tgl Exp $ + * $Id: nodeSeqscan.h,v 1.17 2003/08/04 00:43:31 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 8a3e74ebd1c..ccab4dd3475 100644 --- a/src/include/executor/nodeSubplan.h +++ b/src/include/executor/nodeSubplan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSubplan.h,v 1.15 2002/12/14 00:17:59 tgl Exp $ + * $Id: nodeSubplan.h,v 1.16 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,13 +16,13 @@ #include "nodes/execnodes.h" -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 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 ExecSetParamPlan(SubPlanState *node, ExprContext *econtext); +extern void ExecSetParamPlan(SubPlanState * node, ExprContext *econtext); #endif /* NODESUBPLAN_H */ diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index ead328da247..c7366c1af55 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -2,7 +2,7 @@ * * spi.h * - * $Id: spi.h,v 1.36 2003/03/10 03:53:51 tgl Exp $ + * $Id: spi.h,v 1.37 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -82,8 +82,8 @@ extern int SPI_finish(void); extern void SPI_push(void); extern void SPI_pop(void); extern int SPI_exec(const char *src, int tcount); -extern int SPI_execp(void *plan, Datum *values, const char *Nulls, - int tcount); +extern int SPI_execp(void *plan, Datum *values, const char *Nulls, + int tcount); extern void *SPI_prepare(const char *src, int nargs, Oid *argtypes); extern void *SPI_saveplan(void *plan); extern int SPI_freeplan(void *plan); diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h index 5dd0ff2a6e3..c4a6f65dbff 100644 --- a/src/include/executor/spi_priv.h +++ b/src/include/executor/spi_priv.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: spi_priv.h,v 1.14 2003/05/02 20:54:35 tgl Exp $ + * $Id: spi_priv.h,v 1.15 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,10 @@ typedef struct typedef struct { - /* context containing _SPI_plan itself as well as subsidiary structures */ + /* + * context containing _SPI_plan itself as well as subsidiary + * structures + */ MemoryContext plancxt; /* List of List of querytrees; one sublist per original parsetree */ List *qtlist; diff --git a/src/include/executor/tstoreReceiver.h b/src/include/executor/tstoreReceiver.h index e7d9497ffee..b345fcbaedf 100644 --- a/src/include/executor/tstoreReceiver.h +++ b/src/include/executor/tstoreReceiver.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tstoreReceiver.h,v 1.2 2003/05/06 20:26:28 tgl Exp $ + * $Id: tstoreReceiver.h,v 1.3 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,6 +20,6 @@ extern DestReceiver *CreateTuplestoreDestReceiver(Tuplestorestate *tStore, - MemoryContext tContext); + MemoryContext tContext); -#endif /* TSTORE_RECEIVER_H */ +#endif /* TSTORE_RECEIVER_H */ diff --git a/src/include/getaddrinfo.h b/src/include/getaddrinfo.h index 6312482a7a9..4a12cf4274b 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.7 2003/07/23 23:30:40 tgl Exp $ + * $Id: getaddrinfo.h,v 1.8 2003/08/04 00:43:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,14 +30,15 @@ #ifndef HAVE_STRUCT_ADDRINFO -struct addrinfo { - int ai_flags; - int ai_family; - int ai_socktype; - int ai_protocol; - size_t ai_addrlen; +struct addrinfo +{ + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; struct sockaddr *ai_addr; - char *ai_canonname; + char *ai_canonname; struct addrinfo *ai_next; }; @@ -56,10 +57,9 @@ struct addrinfo { #define NI_NUMERICHOST 1 #define NI_NUMERICSERV 2 +#endif /* HAVE_STRUCT_ADDRINFO */ -#endif /* HAVE_STRUCT_ADDRINFO */ - -#ifndef NI_MAXHOST +#ifndef NI_MAXHOST #define NI_MAXHOST 1025 #define NI_MAXSERV 32 #endif @@ -87,16 +87,15 @@ struct addrinfo { #ifdef getnameinfo #undef getnameinfo #endif -#define getnameinfo pg_getnameinfo +#define getnameinfo pg_getnameinfo extern int getaddrinfo(const char *node, const char *service, - const struct addrinfo *hints, struct addrinfo **res); -extern void freeaddrinfo(struct addrinfo *res); + const struct addrinfo * hints, struct addrinfo ** res); +extern void freeaddrinfo(struct addrinfo * res); extern const char *gai_strerror(int errcode); -extern int getnameinfo(const struct sockaddr *sa, int salen, +extern int getnameinfo(const struct sockaddr * sa, int salen, char *node, int nodelen, char *service, int servicelen, int flags); +#endif /* HAVE_GETADDRINFO */ -#endif /* HAVE_GETADDRINFO */ - -#endif /* GETADDRINFO_H */ +#endif /* GETADDRINFO_H */ diff --git a/src/include/getopt_long.h b/src/include/getopt_long.h index 5b20622cee4..3651cdeee92 100644 --- a/src/include/getopt_long.h +++ b/src/include/getopt_long.h @@ -5,29 +5,29 @@ * Portions Copyright (c) 2003 * PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/include/getopt_long.h,v 1.1 2003/01/06 18:53:25 petere Exp $ + * $Header: /cvsroot/pgsql/src/include/getopt_long.h,v 1.2 2003/08/04 00:43:29 momjian Exp $ */ /* These are picked up from the system's getopt() facility. */ -extern int opterr; -extern int optind; -extern int optopt; +extern int opterr; +extern int optind; +extern int optopt; extern char *optarg; /* Some systems have this, otherwise you need to define it somewhere. */ -extern int optreset; +extern int optreset; -struct option { +struct option +{ const char *name; - int has_arg; - int *flag; - int val; + int has_arg; + int *flag; + int val; }; #define no_argument 0 #define required_argument 1 -int -getopt_long(int argc, char * const argv[], +int getopt_long(int argc, char *const argv[], const char *optstring, - const struct option *longopts, int *longindex); + const struct option * longopts, int *longindex); diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h index 8e305ee430c..587fea172ea 100644 --- a/src/include/lib/stringinfo.h +++ b/src/include/lib/stringinfo.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: stringinfo.h,v 1.26 2003/04/24 21:16:44 tgl Exp $ + * $Id: stringinfo.h,v 1.27 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -85,14 +85,15 @@ extern void initStringInfo(StringInfo str); * to str if necessary. This is sort of like a combination of sprintf and * strcat. */ -extern void appendStringInfo(StringInfo str, const char *fmt, ...) +extern void +appendStringInfo(StringInfo str, const char *fmt,...) /* This extension allows gcc to check the format string */ __attribute__((format(printf, 2, 3))); /*------------------------ * appendStringInfoVA * Attempt to format text data under the control of fmt (an sprintf-style - * format string) and append it to whatever is already in str. If successful + * format string) and append it to whatever is already in str. If successful * return true; if not (because there's not enough space), return false * without modifying str. Typically the caller would enlarge str and retry * on false return --- see appendStringInfo for standard usage pattern. diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h index a881e0ae0a8..bde0568d48e 100644 --- a/src/include/libpq/crypt.h +++ b/src/include/libpq/crypt.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: crypt.h,v 1.24 2002/12/05 18:52:43 momjian Exp $ + * $Id: crypt.h,v 1.25 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,7 +23,7 @@ extern int md5_crypt_verify(const Port *port, const char *user, - char *client_pass); + char *client_pass); extern bool md5_hash(const void *buff, size_t len, char *hexsum); extern bool CheckMD5Pwd(char *passwd, char *storedpwd, char *seed); diff --git a/src/include/libpq/ip.h b/src/include/libpq/ip.h index 5c614b16815..c60030ccf50 100644 --- a/src/include/libpq/ip.h +++ b/src/include/libpq/ip.h @@ -5,7 +5,7 @@ * * Copyright (c) 2003, PostgreSQL Global Development Group * - * $Id: ip.h,v 1.9 2003/07/23 23:30:41 tgl Exp $ + * $Id: ip.h,v 1.10 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,27 +16,27 @@ #include "libpq/pqcomm.h" -extern int getaddrinfo_all(const char *hostname, const char *servname, - const struct addrinfo *hintp, - struct addrinfo **result); -extern void freeaddrinfo_all(int hint_ai_family, struct addrinfo *ai); +extern int getaddrinfo_all(const char *hostname, const char *servname, + const struct addrinfo * hintp, + struct addrinfo ** result); +extern void freeaddrinfo_all(int hint_ai_family, struct addrinfo * ai); -extern int getnameinfo_all(const struct sockaddr_storage *addr, int salen, - char *node, int nodelen, - char *service, int servicelen, - int flags); +extern int getnameinfo_all(const struct sockaddr_storage * addr, int salen, + char *node, int nodelen, + char *service, int servicelen, + int flags); -extern int rangeSockAddr(const struct sockaddr_storage *addr, - const struct sockaddr_storage *netaddr, - const struct sockaddr_storage *netmask); +extern int rangeSockAddr(const struct sockaddr_storage * addr, + const struct sockaddr_storage * netaddr, + const struct sockaddr_storage * netmask); -extern int SockAddr_cidr_mask(struct sockaddr_storage **mask, - char *numbits, int family); +extern int SockAddr_cidr_mask(struct sockaddr_storage ** mask, + char *numbits, int family); #ifdef HAVE_UNIX_SOCKETS -#define IS_AF_UNIX(fam) ((fam) == AF_UNIX) +#define IS_AF_UNIX(fam) ((fam) == AF_UNIX) #else -#define IS_AF_UNIX(fam) (0) +#define IS_AF_UNIX(fam) (0) #endif -#endif /* IP_H */ +#endif /* IP_H */ diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 19ac0402d38..44bf573313f 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-be.h,v 1.35 2003/04/17 22:26:01 tgl Exp $ + * $Id: libpq-be.h,v 1.36 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,8 +30,8 @@ /* * This is used by the postmaster in its communication with frontends. It * contains all state information needed during this communication before the - * backend is run. The Port structure is kept in malloc'd memory and is - * still available when a backend is running (see MyProcPort). The data + * backend is run. The Port structure is kept in malloc'd memory and is + * still available when a backend is running (see MyProcPort). The data * it points to must also be malloc'd, or else palloc'd in TopMemoryContext, * so that it survives into PostgresMain execution! */ @@ -44,9 +44,10 @@ typedef struct Port SockAddr raddr; /* remote addr (client) */ /* - * Information that needs to be saved from the startup packet and passed - * into backend execution. "char *" fields are NULL if not set. - * guc_options points to a List of alternating option names and values. + * Information that needs to be saved from the startup packet and + * passed into backend execution. "char *" fields are NULL if not + * set. guc_options points to a List of alternating option names and + * values. */ char *database_name; char *user_name; diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index 9f72b7e432c..82e621fcd1e 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq.h,v 1.58 2003/06/12 07:36:51 momjian Exp $ + * $Id: libpq.h,v 1.59 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,8 +46,8 @@ typedef struct * prototypes for functions in pqcomm.c */ extern int StreamServerPort(int family, char *hostName, - unsigned short portNumber, char *unixSocketName, int ListenSocket[], - int MaxListen); + unsigned short portNumber, char *unixSocketName, int ListenSocket[], + int MaxListen); extern int StreamConnection(int server_fd, Port *port); extern void StreamClose(int sock); extern void TouchSocketFile(void); @@ -66,11 +66,11 @@ extern void pq_endcopyout(bool errorAbort); /* * prototypes for functions in be-secure.c */ -extern int secure_initialize(void); -extern void secure_destroy(void); -extern int secure_open_server(Port *port); -extern void secure_close(Port *port); -extern ssize_t secure_read(Port *port, void *ptr, size_t len); -extern ssize_t secure_write(Port *port, void *ptr, size_t len); +extern int secure_initialize(void); +extern void secure_destroy(void); +extern int secure_open_server(Port *port); +extern void secure_close(Port *port); +extern ssize_t secure_read(Port *port, void *ptr, size_t len); +extern ssize_t secure_write(Port *port, void *ptr, size_t len); #endif /* LIBPQ_H */ diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h index 2e41b0896ad..da756fb3166 100644 --- a/src/include/libpq/pqcomm.h +++ b/src/include/libpq/pqcomm.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqcomm.h,v 1.91 2003/07/27 17:10:07 tgl Exp $ + * $Id: pqcomm.h,v 1.92 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,11 +35,11 @@ #ifdef HAVE_STRUCT_SOCKADDR_STORAGE #ifndef HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY -# ifdef HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY -# define ss_family __ss_family -# else -# error struct sockaddr_storage does not provide an ss_family member -# endif +#ifdef HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY +#define ss_family __ss_family +#else +#error struct sockaddr_storage does not provide an ss_family member +#endif #endif #ifdef HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN @@ -47,16 +47,18 @@ #define HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN 1 #endif -#else /* !HAVE_STRUCT_SOCKADDR_STORAGE */ +#else /* !HAVE_STRUCT_SOCKADDR_STORAGE */ /* Define a struct sockaddr_storage if we don't have one. */ -struct sockaddr_storage { - union { +struct sockaddr_storage +{ + union + { struct sockaddr sa; /* get the system-dependent fields */ - int64 ss_align; /* ensures struct is properly aligned */ - char ss_pad[128]; /* ensures struct has desired size */ - } ss_stuff; + int64 ss_align; /* ensures struct is properly aligned */ + char ss_pad[128]; /* ensures struct has desired size */ + } ss_stuff; }; #define ss_family ss_stuff.sa.sa_family @@ -65,12 +67,12 @@ struct sockaddr_storage { #define ss_len ss_stuff.sa.sa_len #define HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN 1 #endif +#endif /* HAVE_STRUCT_SOCKADDR_STORAGE */ -#endif /* HAVE_STRUCT_SOCKADDR_STORAGE */ - -typedef struct { - struct sockaddr_storage addr; - ACCEPT_TYPE_ARG3 salen; +typedef struct +{ + struct sockaddr_storage addr; + ACCEPT_TYPE_ARG3 salen; } SockAddr; /* Configure the UNIX socket location for the well known port. */ @@ -148,7 +150,7 @@ extern bool Db_user_namespace; /* * In protocol 3.0 and later, the startup packet length is not fixed, but - * we set an arbitrary limit on it anyway. This is just to prevent simple + * we set an arbitrary limit on it anyway. This is just to prevent simple * denial-of-service attacks via sending enough data to run the server * out of memory. */ diff --git a/src/include/libpq/pqformat.h b/src/include/libpq/pqformat.h index 2102960e884..9f73083e10a 100644 --- a/src/include/libpq/pqformat.h +++ b/src/include/libpq/pqformat.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqformat.h,v 1.18 2003/05/09 21:19:50 tgl Exp $ + * $Id: pqformat.h,v 1.19 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ extern void pq_beginmessage(StringInfo buf, char msgtype); extern void pq_sendbyte(StringInfo buf, int byt); extern void pq_sendbytes(StringInfo buf, const char *data, int datalen); extern void pq_sendcountedtext(StringInfo buf, const char *str, int slen, - bool countincludesself); + bool countincludesself); extern void pq_sendtext(StringInfo buf, const char *str, int slen); extern void pq_sendstring(StringInfo buf, const char *str); extern void pq_sendint(StringInfo buf, int i, int b); diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index 7c7da9d1994..a281c586a59 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -1,4 +1,4 @@ -/* $Id: pg_wchar.h,v 1.47 2003/07/27 04:53:11 tgl Exp $ */ +/* $Id: pg_wchar.h,v 1.48 2003/08/04 00:43:31 momjian Exp $ */ #ifndef PG_WCHAR_H #define PG_WCHAR_H @@ -295,7 +295,7 @@ extern int pg_database_encoding_max_length(void); extern void SetDefaultClientEncoding(void); extern int SetClientEncoding(int encoding, bool doit); -extern void InitializeClientEncoding(void); +extern void InitializeClientEncoding(void); extern int pg_get_client_encoding(void); extern const char *pg_get_client_encoding_name(void); diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index 7e7219ef4dc..2531879417c 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: miscadmin.h,v 1.129 2003/07/29 00:03:18 tgl Exp $ + * $Id: miscadmin.h,v 1.130 2003/08/04 00:43:29 momjian Exp $ * * NOTES * some of the information in this file should be moved to @@ -54,8 +54,8 @@ * A related, but conceptually distinct, mechanism is the "critical section" * mechanism. A critical section not only holds off cancel/die interrupts, * but causes any ereport(ERROR) or ereport(FATAL) to become ereport(PANIC) - * --- that is, a system-wide reset is forced. Needless to say, only really - * *critical* code should be marked as a critical section! Currently, this + * --- that is, a system-wide reset is forced. Needless to say, only really + * *critical* code should be marked as a critical section! Currently, this * mechanism is only used for XLOG-related code. * *****************************************************************************/ @@ -196,9 +196,11 @@ extern bool NetServer; extern bool EnableSSL; extern bool SilentMode; extern int MaxBackends; + #define DEF_MAXBACKENDS 32 extern int ReservedBackends; -extern DLLIMPORT int NBuffers; +extern DLLIMPORT int NBuffers; + #define DEF_NBUFFERS (DEF_MAXBACKENDS > 8 ? DEF_MAXBACKENDS * 2 : 16) extern int PostPortNumber; extern int Unix_socket_permissions; @@ -243,7 +245,7 @@ extern char *convertstr(unsigned char *buff, int len, int dest); /* in utils/misc/superuser.c */ extern bool superuser(void); /* current user is superuser */ -extern bool superuser_arg(AclId userid); /* given user is superuser */ +extern bool superuser_arg(AclId userid); /* given user is superuser */ /***************************************************************************** diff --git a/src/include/nodes/bitmapset.h b/src/include/nodes/bitmapset.h index 7974c44aae7..6c2e8ac13c5 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.2 2003/06/29 23:05:05 tgl Exp $ + * $Id: bitmapset.h,v 1.3 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,12 +27,13 @@ /* The unit size can be adjusted by changing these three declarations: */ #define BITS_PER_BITMAPWORD 32 typedef uint32 bitmapword; /* must be an unsigned type */ -typedef int32 signedbitmapword; /* must be the matching signed type */ +typedef int32 signedbitmapword; /* must be the matching signed type */ -typedef struct Bitmapset { - int nwords; /* number of words in array */ - bitmapword words[1]; /* really [nwords] */ -} Bitmapset; /* VARIABLE LENGTH STRUCT */ +typedef struct Bitmapset +{ + int nwords; /* number of words in array */ + bitmapword words[1]; /* really [nwords] */ +} Bitmapset; /* VARIABLE LENGTH STRUCT */ /* result of bms_membership */ @@ -41,41 +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 c6f13423438..dc68f88a62a 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execnodes.h,v 1.100 2003/06/29 00:33:44 tgl Exp $ + * $Id: execnodes.h,v 1.101 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,10 +46,10 @@ typedef struct IndexInfo NodeTag type; int ii_NumIndexAttrs; AttrNumber ii_KeyAttrNumbers[INDEX_MAX_KEYS]; - List *ii_Expressions; /* list of Expr */ - List *ii_ExpressionsState; /* list of ExprState */ + List *ii_Expressions; /* list of Expr */ + List *ii_ExpressionsState; /* list of ExprState */ List *ii_Predicate; /* list of Expr */ - List *ii_PredicateState; /* list of ExprState */ + List *ii_PredicateState; /* list of ExprState */ bool ii_Unique; } IndexInfo; @@ -80,7 +80,7 @@ typedef struct ExprContext_CB * * There are two memory contexts associated with an ExprContext: * * ecxt_per_query_memory is a query-lifespan context, typically the same - * context the ExprContext node itself is allocated in. This context + * context the ExprContext node itself is allocated in. This context * can be used for purposes such as storing function call cache info. * * ecxt_per_tuple_memory is a short-term context for expression results. * As the name suggests, it will typically be reset once per tuple, @@ -176,7 +176,7 @@ typedef struct ReturnSetInfo * call ExecProject(). -cim 6/3/91 * * ExecProject() evaluates the tlist, forms a tuple, and stores it - * in the given slot. As a side-effect, the actual datum values and + * in the given slot. As a side-effect, the actual datum values and * null indicators are placed in the work arrays tupValues/tupNulls. * * targetlist target list for projection @@ -283,9 +283,9 @@ typedef struct EState NodeTag type; /* Basic state for all query types: */ - ScanDirection es_direction; /* current scan direction */ + ScanDirection es_direction; /* current scan direction */ Snapshot es_snapshot; /* time qual to use */ - List *es_range_table; /* List of RangeTableEntrys */ + List *es_range_table; /* List of RangeTableEntrys */ /* Info about target table for insert/update/delete queries: */ ResultRelInfo *es_result_relations; /* array of ResultRelInfos */ @@ -293,7 +293,7 @@ typedef struct EState ResultRelInfo *es_result_relation_info; /* currently active array * elt */ JunkFilter *es_junkFilter; /* currently active junk filter */ - Relation es_into_relation_descriptor; /* for SELECT INTO */ + Relation es_into_relation_descriptor; /* for SELECT INTO */ /* Parameter info: */ ParamListInfo es_param_list_info; /* values of external params */ @@ -309,10 +309,11 @@ typedef struct EState List *es_rowMark; /* not good place, but there is no other */ bool es_instrument; /* true requests runtime instrumentation */ - bool es_force_oids; /* true forces result tuples to have (space - * for) OIDs --- used for SELECT INTO */ + bool es_force_oids; /* true forces result tuples to have + * (space for) OIDs --- used for SELECT + * INTO */ - List *es_exprcontexts; /* List of ExprContexts within EState */ + List *es_exprcontexts; /* List of ExprContexts within EState */ /* * this ExprContext is for per-output-tuple operations, such as @@ -324,10 +325,11 @@ typedef struct EState /* Below is to re-evaluate plan qual in READ COMMITTED mode */ Plan *es_topPlan; /* link to top of plan tree */ - struct evalPlanQual *es_evalPlanQual; /* chain of PlanQual states */ - bool *es_evTupleNull; /* local array of EPQ status */ + struct evalPlanQual *es_evalPlanQual; /* chain of PlanQual + * states */ + bool *es_evTupleNull; /* local array of EPQ status */ HeapTuple *es_evTuple; /* shared array of EPQ substitute tuples */ - bool es_useEvalPlan; /* evaluating EPQ tuples? */ + bool es_useEvalPlan; /* evaluating EPQ tuples? */ } EState; @@ -346,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 { @@ -359,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, \ @@ -397,7 +399,7 @@ typedef struct ExprState { NodeTag type; Expr *expr; /* associated Expr node */ -} ExprState; +} ExprState; /* ---------------- * GenericExprState node @@ -410,7 +412,7 @@ typedef struct GenericExprState { ExprState xprstate; ExprState *arg; /* state of my child node */ -} GenericExprState; +} GenericExprState; /* ---------------- * AggrefExprState node @@ -421,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 @@ -434,7 +436,7 @@ typedef struct AggrefExprState typedef struct ArrayRefExprState { ExprState xprstate; - List *refupperindexpr; /* states for child nodes */ + List *refupperindexpr; /* states for child nodes */ List *reflowerindexpr; ExprState *refexpr; ExprState *refassgnexpr; @@ -442,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 @@ -458,17 +460,17 @@ typedef struct FuncExprState List *args; /* states of argument expressions */ /* - * Function manager's lookup info for the target function. If func.fn_oid - * is InvalidOid, we haven't initialized it yet. + * Function manager's lookup info for the target function. If + * func.fn_oid is InvalidOid, we haven't initialized it yet. */ FmgrInfo func; /* - * We also need to store argument values across calls when evaluating a - * function-returning-set. + * We also need to store argument values across calls when evaluating + * a function-returning-set. * - * setArgsValid is true when we are evaluating a set-valued function - * and we are in the middle of a call series; we want to pass the same + * setArgsValid is true when we are evaluating a set-valued function and + * we are in the middle of a call series; we want to pass the same * argument values to the function again (and again, until it returns * ExprEndResult). */ @@ -486,7 +488,7 @@ typedef struct FuncExprState * data only if setArgsValid is true. */ FunctionCallInfoData setArgs; -} FuncExprState; +} FuncExprState; /* ---------------- * ScalarArrayOpExprState node @@ -496,13 +498,13 @@ typedef struct FuncExprState */ typedef struct ScalarArrayOpExprState { - FuncExprState fxprstate; + FuncExprState fxprstate; /* Cached info about array element type */ - Oid element_type; - int16 typlen; - bool typbyval; - char typalign; -} ScalarArrayOpExprState; + Oid element_type; + int16 typlen; + bool typbyval; + char typalign; +} ScalarArrayOpExprState; /* ---------------- * BoolExprState node @@ -512,7 +514,7 @@ typedef struct BoolExprState { ExprState xprstate; List *args; /* states of argument expression(s) */ -} BoolExprState; +} BoolExprState; /* ---------------- * SubPlanState node @@ -522,7 +524,7 @@ typedef struct SubPlanState { ExprState xprstate; EState *sub_estate; /* subselect plan has its own EState */ - struct PlanState *planstate; /* subselect plan's state tree */ + struct PlanState *planstate; /* subselect plan's state tree */ List *exprs; /* states of combining expression(s) */ List *args; /* states of argument expression(s) */ bool needShutdown; /* TRUE = need to shutdown subplan */ @@ -535,11 +537,11 @@ typedef struct SubPlanState bool havehashrows; /* TRUE if hashtable is not empty */ bool havenullrows; /* TRUE if hashnulls is not empty */ MemoryContext tablecxt; /* memory context containing tables */ - ExprContext *innerecontext; /* working context for comparisons */ + ExprContext *innerecontext; /* working context for comparisons */ 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 @@ -550,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 @@ -561,7 +563,7 @@ typedef struct CaseWhenState ExprState xprstate; ExprState *expr; /* condition expression */ ExprState *result; /* substitution result */ -} CaseWhenState; +} CaseWhenState; /* ---------------- * ArrayExprState node @@ -577,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 @@ -586,8 +588,8 @@ typedef struct ArrayExprState typedef struct CoalesceExprState { ExprState xprstate; - List *args; /* the arguments */ -} CoalesceExprState; + List *args; /* the arguments */ +} CoalesceExprState; /* ---------------- * CoerceToDomainState node @@ -599,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 @@ -612,15 +614,15 @@ typedef enum DomainConstraintType { DOM_CONSTRAINT_NOTNULL, DOM_CONSTRAINT_CHECK -} DomainConstraintType; +} DomainConstraintType; typedef struct DomainConstraintState { NodeTag type; - DomainConstraintType constrainttype; /* constraint type */ + DomainConstraintType constrainttype; /* constraint type */ char *name; /* name of constraint (for error msgs) */ ExprState *check_expr; /* for CHECK, a boolean expression */ -} DomainConstraintState; +} DomainConstraintState; /* ---------------------------------------------------------------- @@ -652,13 +654,14 @@ typedef struct PlanState * plan node */ /* - * Common structural data for all Plan types. These links to subsidiary - * state trees parallel links in the associated plan tree (except for - * the subPlan list, which does not exist in the plan tree). + * Common structural data for all Plan types. These links to + * subsidiary state trees parallel links in the associated plan tree + * (except for the subPlan list, which does not exist in the plan + * tree). */ List *targetlist; /* target list to be computed at this node */ List *qual; /* implicitly-ANDed qual conditions */ - struct PlanState *lefttree; /* input plan tree(s) */ + struct PlanState *lefttree; /* input plan tree(s) */ struct PlanState *righttree; List *initPlan; /* Init SubPlanState nodes (un-correlated * expr subselects) */ @@ -672,13 +675,13 @@ typedef struct PlanState /* * Other run-time state needed by most if not all node types. */ - TupleTableSlot *ps_OuterTupleSlot; /* slot for current "outer" tuple */ - TupleTableSlot *ps_ResultTupleSlot; /* slot for my result tuples */ - ExprContext *ps_ExprContext; /* node's expression-evaluation context */ - ProjectionInfo *ps_ProjInfo; /* info for doing tuple projection */ - bool ps_TupFromTlist; /* state flag for processing set-valued - * functions in targetlist */ -} PlanState; + TupleTableSlot *ps_OuterTupleSlot; /* slot for current "outer" tuple */ + TupleTableSlot *ps_ResultTupleSlot; /* slot for my result tuples */ + ExprContext *ps_ExprContext; /* node's expression-evaluation context */ + ProjectionInfo *ps_ProjInfo; /* info for doing tuple projection */ + bool ps_TupFromTlist;/* state flag for processing set-valued + * functions in targetlist */ +} PlanState; /* ---------------- * these are are defined to avoid confusion problems with "left" @@ -747,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 @@ -894,9 +897,9 @@ typedef struct NestLoopState typedef struct MergeJoinState { JoinState js; /* its first field is NodeTag */ - List *mergeclauses; /* list of ExprState nodes */ - List *mj_OuterSkipQual; /* list of ExprState nodes */ - List *mj_InnerSkipQual; /* list of ExprState nodes */ + List *mergeclauses; /* list of ExprState nodes */ + List *mj_OuterSkipQual; /* list of ExprState nodes */ + List *mj_InnerSkipQual; /* list of ExprState nodes */ int mj_JoinState; bool mj_MatchedOuter; bool mj_MatchedInner; @@ -934,9 +937,9 @@ typedef struct HashJoinState HashJoinTable hj_HashTable; int hj_CurBucketNo; HashJoinTuple hj_CurTuple; - List *hj_OuterHashKeys; /* list of ExprState nodes */ - List *hj_InnerHashKeys; /* list of ExprState nodes */ - List *hj_HashOperators; /* list of operator OIDs */ + List *hj_OuterHashKeys; /* list of ExprState nodes */ + List *hj_InnerHashKeys; /* list of ExprState nodes */ + List *hj_HashOperators; /* list of operator OIDs */ TupleTableSlot *hj_OuterTupleSlot; TupleTableSlot *hj_HashTupleSlot; TupleTableSlot *hj_NullInnerTupleSlot; @@ -963,8 +966,8 @@ typedef struct HashJoinState typedef struct MaterialState { ScanState ss; /* its first field is NodeTag */ - void *tuplestorestate; /* private state of tuplestore.c */ - bool eof_underlying; /* reached end of underlying plan? */ + void *tuplestorestate; /* private state of tuplestore.c */ + bool eof_underlying; /* reached end of underlying plan? */ } MaterialState; /* ---------------- @@ -975,7 +978,7 @@ typedef struct SortState { ScanState ss; /* its first field is NodeTag */ bool sort_Done; /* sort completed yet? */ - void *tuplesortstate; /* private state of tuplesort.c */ + void *tuplesortstate; /* private state of tuplesort.c */ } SortState; /* --------------------- @@ -986,7 +989,7 @@ typedef struct GroupState { ScanState ss; /* its first field is NodeTag */ FmgrInfo *eqfunctions; /* per-field lookup data for equality fns */ - HeapTuple grp_firstTuple; /* copy of first tuple of current group */ + HeapTuple grp_firstTuple; /* copy of first tuple of current group */ bool grp_done; /* indicates completion of Group scan */ } GroupState; @@ -1019,11 +1022,11 @@ typedef struct AggState bool agg_done; /* indicates completion of Agg scan */ /* these fields are used in AGG_PLAIN and AGG_SORTED modes: */ AggStatePerGroup pergroup; /* per-Aggref-per-group working state */ - HeapTuple grp_firstTuple; /* copy of first tuple of current group */ + HeapTuple grp_firstTuple; /* copy of first tuple of current group */ /* these fields are used in AGG_HASHED mode: */ TupleHashTable hashtable; /* hash table with one entry per group */ bool table_filled; /* hash table filled yet? */ - TupleHashIterator hashiter; /* for iterating through hash table */ + TupleHashIterator hashiter; /* for iterating through hash table */ } AggState; /* ---------------- @@ -1097,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/makefuncs.h b/src/include/nodes/makefuncs.h index f1b45e897bb..3f0772aa197 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: makefuncs.h,v 1.45 2003/07/01 19:10:53 tgl Exp $ + * $Id: makefuncs.h,v 1.46 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,10 +18,10 @@ extern A_Expr *makeA_Expr(A_Expr_Kind kind, List *name, - Node *lexpr, Node *rexpr); + Node *lexpr, Node *rexpr); extern A_Expr *makeSimpleA_Expr(A_Expr_Kind kind, const char *name, - Node *lexpr, Node *rexpr); + Node *lexpr, Node *rexpr); extern Var *makeVar(Index varno, AttrNumber varattno, @@ -50,13 +50,13 @@ extern Expr *makeBoolExpr(BoolExprType boolop, List *args); extern Alias *makeAlias(const char *aliasname, List *colnames); extern RelabelType *makeRelabelType(Expr *arg, Oid rtype, int32 rtypmod, - CoercionForm rformat); + CoercionForm rformat); extern RangeVar *makeRangeVar(char *schemaname, char *relname); extern TypeName *makeTypeName(char *typnam); extern FuncExpr *makeFuncExpr(Oid funcid, Oid rettype, - List *args, CoercionForm fformat); + List *args, CoercionForm fformat); #endif /* MAKEFUNC_H */ diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index 6e678b26b33..2bd81698d1e 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodes.h,v 1.144 2003/07/03 16:34:25 tgl Exp $ + * $Id: nodes.h,v 1.145 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -129,8 +129,8 @@ typedef enum NodeTag /* * TAGS FOR EXPRESSION STATE NODES (execnodes.h) * - * These correspond (not always one-for-one) to primitive nodes - * derived from Expr. + * These correspond (not always one-for-one) to primitive nodes derived + * from Expr. */ T_ExprState = 400, T_GenericExprState, diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index 8d7aa3ab32b..19a23096609 100644 --- a/src/include/nodes/params.h +++ b/src/include/nodes/params.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: params.h,v 1.21 2002/12/14 00:17:59 tgl Exp $ + * $Id: params.h,v 1.22 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,7 +51,7 @@ * ParamListInfo * * ParamListInfo entries are used to pass parameters into the executor - * for parameterized plans. Each entry in the array defines the value + * for parameterized plans. Each entry in the array defines the value * to be substituted for a PARAM_NAMED or PARAM_NUM parameter. * * kind : the kind of parameter (PARAM_NAMED or PARAM_NUM) @@ -89,9 +89,9 @@ typedef ParamListInfoData *ParamListInfo; * es_param_exec_vals or ecxt_param_exec_vals. * * If execPlan is not NULL, it points to a SubPlanState node that needs - * to be executed to produce the value. (This is done so that we can have + * to be executed to produce the value. (This is done so that we can have * lazy evaluation of InitPlans: they aren't executed until/unless a - * result value is needed.) Otherwise the value is assumed to be valid + * result value is needed.) Otherwise the value is assumed to be valid * when needed. * ---------------- */ diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 5cfe5ec645d..15de2ade0ea 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.243 2003/07/03 16:34:25 tgl Exp $ + * $Id: parsenodes.h,v 1.244 2003/08/04 00:43:31 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; /***************************************************************************** @@ -45,7 +45,7 @@ typedef struct Query CmdType commandType; /* select|insert|update|delete|utility */ - QuerySource querySource; /* where did I come from? */ + QuerySource querySource; /* where did I come from? */ bool canSetTag; /* do I set the command result tag? */ @@ -175,12 +175,12 @@ 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 { NodeTag type; - A_Expr_Kind kind; /* see above */ + A_Expr_Kind kind; /* see above */ List *name; /* possibly-qualified name of operator */ Node *lexpr; /* left argument, or NULL if none */ Node *rexpr; /* right argument, or NULL if none */ @@ -352,7 +352,7 @@ typedef struct InhRelation NodeTag type; RangeVar *relation; bool including_defaults; -} InhRelation; +} InhRelation; /* * IndexElem - index parameters (used in CREATE INDEX) @@ -668,7 +668,8 @@ typedef struct SetOperationStmt * object type. */ -typedef enum ObjectType { +typedef enum ObjectType +{ OBJECT_AGGREGATE, OBJECT_CAST, OBJECT_COLUMN, @@ -690,7 +691,7 @@ typedef enum ObjectType { OBJECT_TYPE, OBJECT_USER, OBJECT_VIEW -} ObjectType; +} ObjectType; /* ---------------------- * Create Schema Statement @@ -739,7 +740,7 @@ typedef struct AlterTableStmt * E = create toast table * U = change owner * L = CLUSTER ON - * o = DROP OIDS + * o = DROP OIDS *------------ */ RangeVar *relation; /* table to work on */ @@ -773,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; /* ---------------------- @@ -878,14 +879,15 @@ 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 { NodeTag type; RangeVar *relation; /* relation to create */ List *tableElts; /* column definitions (list of ColumnDef) */ - List *inhRelations; /* relations to inherit from (list of inhRelation) */ + List *inhRelations; /* relations to inherit from (list of + * inhRelation) */ List *constraints; /* constraints (list of Constraint nodes) */ bool hasoids; /* should it have OIDs? */ OnCommitAction oncommit; /* what do we do at COMMIT? */ @@ -1094,7 +1096,7 @@ typedef struct AlterSeqStmt NodeTag type; RangeVar *sequence; /* the sequence to alter */ List *options; -} AlterSeqStmt; +} AlterSeqStmt; /* ---------------------- * Create {Aggregate|Operator|Type} Statement @@ -1220,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 @@ -1244,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 @@ -1269,8 +1271,9 @@ typedef struct IndexStmt char *accessMethod; /* name of access method (eg. btree) */ List *indexParams; /* a list of IndexElem */ Node *whereClause; /* qualification (partial-index predicate) */ - List *rangetable; /* range table for qual and/or expressions, - * filled in by transformStmt() */ + List *rangetable; /* range table for qual and/or + * expressions, filled in by + * transformStmt() */ bool unique; /* is index unique? */ bool primary; /* is index on primary key? */ bool isconstraint; /* is it from a CONSTRAINT clause? */ @@ -1349,7 +1352,8 @@ typedef struct RenameStmt RangeVar *relation; /* in case it's a table */ List *object; /* in case it's some other object */ List *objarg; /* argument types, if applicable */ - char *subname; /* name of contained object (column, rule, trigger, etc) */ + char *subname; /* name of contained object (column, rule, + * trigger, etc) */ char *newname; /* the new name */ ObjectType renameType; /* OBJECT_TABLE, OBJECT_COLUMN, etc */ } RenameStmt; @@ -1410,7 +1414,7 @@ typedef enum TransactionStmtKind TRANS_STMT_START, /* semantically identical to BEGIN */ TRANS_STMT_COMMIT, TRANS_STMT_ROLLBACK -} TransactionStmtKind; +} TransactionStmtKind; typedef struct TransactionStmt { @@ -1602,7 +1606,8 @@ typedef struct ConstraintsSetStmt typedef struct ReindexStmt { NodeTag type; - ObjectType kind; /* OBJECT_INDEX, OBJECT_TABLE, OBJECT_DATABASE */ + ObjectType kind; /* OBJECT_INDEX, OBJECT_TABLE, + * OBJECT_DATABASE */ RangeVar *relation; /* Table or index to reindex */ const char *name; /* name of database to reindex */ bool force; diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index 5bf17ceb14e..4c8ae3440ed 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_list.h,v 1.37 2003/06/15 22:51:45 tgl Exp $ + * $Id: pg_list.h,v 1.38 2003/08/04 00:43:31 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 9db779d8bf9..7a76cbba732 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: plannodes.h,v 1.65 2003/05/06 00:20:33 tgl Exp $ + * $Id: plannodes.h,v 1.66 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,8 +68,8 @@ typedef struct Plan * Information for management of parameter-change-driven rescanning * * extParam includes the paramIDs of all external PARAM_EXEC params - * affecting this plan node or its children. setParam params from - * the node's initPlans are not included, but their extParams are. + * affecting this plan node or its children. setParam params from the + * node's initPlans are not included, but their extParams are. * * allParam includes all the extParam paramIDs, plus the IDs of local * params that affect the node (i.e., the setParams of its initplans). @@ -315,12 +315,12 @@ 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 { Plan plan; - AggStrategy aggstrategy; + AggStrategy aggstrategy; int numCols; /* number of grouping columns */ AttrNumber *grpColIdx; /* their indexes in the target list */ long numGroups; /* estimated number of groups in input */ diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index 522ddc5f902..c747d6dbbc2 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: primnodes.h,v 1.87 2003/07/03 16:34:26 tgl Exp $ + * $Id: primnodes.h,v 1.88 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,7 +49,7 @@ * associated SortClause or GroupClause lists determine the semantics. * * resorigtbl/resorigcol identify the source of the column, if it is a - * simple reference to a column of a base table (or view). If it is not + * simple reference to a column of a base table (or view). If it is not * a simple reference, these fields are zeroes. * * If resjunk is true then the column is a working column (such as a sort key) @@ -63,8 +63,8 @@ typedef struct Resdom Oid restype; /* type of the value */ int32 restypmod; /* type-specific modifier of the value */ char *resname; /* name of the column (could be NULL) */ - Index ressortgroupref; /* nonzero if referenced by a - * sort/group clause */ + Index ressortgroupref;/* nonzero if referenced by a sort/group + * clause */ Oid resorigtbl; /* OID of column's source table */ AttrNumber resorigcol; /* column's number in source table */ bool resjunk; /* set to true to eliminate the attribute @@ -181,10 +181,10 @@ typedef struct Const Datum constvalue; /* the constant's value */ bool constisnull; /* whether the constant is null (if true, * constvalue is undefined) */ - bool constbyval; /* whether this datatype is passed by value. - * If true, then all the information is - * stored in the Datum. - * If false, then the Datum contains a + bool constbyval; /* whether this datatype is passed by + * value. If true, then all the + * information is stored in the Datum. If + * false, then the Datum contains a * pointer to the information. */ } Const; @@ -201,7 +201,7 @@ typedef struct Const * i.e. something like `$1', `$2' etc. * The number is contained in the `paramid' field. * - * PARAM_EXEC: The parameter is an internal executor parameter. + * PARAM_EXEC: The parameter is an internal executor parameter. * It has a number contained in the `paramid' field. * ---------------- */ @@ -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,28 +351,28 @@ 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 * * Notice the arguments are given as a List. For NOT, of course the list * must always have exactly one element. For AND and OR, the executor can - * handle any number of arguments. The parser treats AND and OR as binary + * handle any number of arguments. The parser treats AND and OR as binary * and so it only produces two-element lists, but the optimizer will flatten * trees of AND and OR nodes to produce longer lists when possible. */ 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 @@ -405,7 +405,7 @@ typedef struct BoolExpr * * NOTE: in the raw output of gram.y, lefthand contains a list of raw * expressions; useOr and operOids are not filled in yet. Also, subselect - * is a raw parsetree. During parse analysis, the parser transforms the + * is a raw parsetree. During parse analysis, the parser transforms the * lefthand expression list using normal expression transformation rules. * It fills operOids with the OIDs representing the specific operator(s) * to apply to each pair of lefthand and targetlist expressions. @@ -452,13 +452,13 @@ typedef struct SubLink * (OpExpr trees) for the combining operators; their left-hand arguments are * the original lefthand expressions, and their right-hand arguments are * PARAM_EXEC Param nodes representing the outputs of the sub-select. - * (NOTE: runtime coercion functions may be inserted as well.) But if the + * (NOTE: runtime coercion functions may be inserted as well.) But if the * sub-select becomes an initplan rather than a subplan, these executable * expressions are part of the outer plan's expression tree (and the SubPlan * node itself is not). In this case "exprs" is NIL to avoid duplication. * * The planner also derives lists of the values that need to be passed into - * and out of the subplan. Input values are represented as a list "args" of + * and out of the subplan. Input values are represented as a list "args" of * expressions to be evaluated in the outer-query context (currently these * args are always just Vars, but in principle they could be any expression). * The values are assigned to the global PARAM_EXEC params indexed by parParam @@ -487,16 +487,17 @@ typedef struct SubPlan * (TopPlan node ?)... */ List *rtable; /* range table for subselect */ /* Information about execution strategy: */ - bool useHashTable; /* TRUE to store subselect output in a hash - * table (implies we are doing "IN") */ - bool unknownEqFalse; /* TRUE if it's okay to return FALSE when + bool useHashTable; /* TRUE to store subselect output in a + * hash table (implies we are doing "IN") */ + bool unknownEqFalse; /* TRUE if it's okay to return FALSE when * the spec result is UNKNOWN; this allows * much simpler handling of null values */ /* Information for passing params into and out of the subselect: */ /* setParam and parParam are lists of integers (param IDs) */ List *setParam; /* initplan subqueries have to set these * Params for parent plan */ - List *parParam; /* indices of input Params from parent plan */ + List *parParam; /* indices of input Params from parent + * plan */ List *args; /* exprs to pass as parParam values */ } SubPlan; @@ -539,7 +540,7 @@ typedef struct RelabelType Expr *arg; /* input expression */ Oid resulttype; /* output type of coercion expression */ int32 resulttypmod; /* output typmod (usually -1) */ - CoercionForm relabelformat; /* how to display this node */ + CoercionForm relabelformat; /* how to display this node */ } RelabelType; /* @@ -574,20 +575,20 @@ typedef struct ArrayExpr { Expr xpr; Oid array_typeid; /* type of expression result */ - Oid element_typeid; /* common type of expression elements */ + 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 */ typedef struct CoalesceExpr { - Expr xpr; - Oid coalescetype; /* type of expression result */ - List *args; /* the arguments */ -} CoalesceExpr; + Expr xpr; + Oid coalescetype; /* type of expression result */ + List *args; /* the arguments */ +} CoalesceExpr; /* * NullIfExpr - a NULLIF expression @@ -645,8 +646,8 @@ typedef struct BooleanTest * * CoerceToDomain represents the operation of coercing a value to a domain * type. At runtime (and not before) the precise set of constraints to be - * checked will be determined. If the value passes, it is returned as the - * result; if not, an error is raised. Note that this is equivalent to + * checked will be determined. If the value passes, it is returned as the + * result; if not, an error is raised. Note that this is equivalent to * RelabelType in the scenario where no constraints are applied. */ typedef struct CoerceToDomain @@ -655,12 +656,12 @@ typedef struct CoerceToDomain Expr *arg; /* input expression */ Oid resulttype; /* domain type ID (result type) */ int32 resulttypmod; /* output typmod (currently always -1) */ - CoercionForm coercionformat; /* how to display this node */ -} CoerceToDomain; + CoercionForm coercionformat; /* how to display this node */ +} CoerceToDomain; /* * Placeholder node for the value to be processed by a domain's check - * constraint. This is effectively like a Param, but can be implemented more + * constraint. This is effectively like a Param, but can be implemented more * simply since we need only one replacement value at a time. * * Note: the typeId/typeMod will be set from the domain's base type, not @@ -672,13 +673,13 @@ 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. * * This is not an executable expression: it must be replaced by the actual - * column default expression during rewriting. But it is convenient to + * column default expression during rewriting. But it is convenient to * treat it as an expression node during parsing and rewriting. */ typedef struct SetToDefault @@ -686,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 2ab9e0f6e7f..158a23427cf 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: relation.h,v 1.82 2003/06/29 23:05:05 tgl Exp $ + * $Id: relation.h,v 1.83 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,7 +43,7 @@ typedef struct QualCost { Cost startup; /* one-time cost */ Cost per_tuple; /* per-evaluation cost */ -} QualCost; +} QualCost; /*---------- * RelOptInfo @@ -218,12 +218,13 @@ typedef struct RelOptInfo Relids index_outer_relids; /* other relids in indexable join * clauses */ List *index_inner_paths; /* InnerIndexscanInfo nodes */ + /* - * Inner indexscans are not in the main pathlist because they are - * not usable except in specific join contexts. We use the + * Inner indexscans are not in the main pathlist because they are not + * usable except in specific join contexts. We use the * index_inner_paths list just to avoid recomputing the best inner - * indexscan repeatedly for similar outer relations. See comments - * for InnerIndexscanInfo. + * indexscan repeatedly for similar outer relations. See comments for + * InnerIndexscanInfo. */ } RelOptInfo; @@ -266,7 +267,8 @@ typedef struct IndexOptInfo RegProcedure amcostestimate; /* OID of the access method's cost fcn */ - List *indexprs; /* expressions for non-simple index columns */ + List *indexprs; /* expressions for non-simple index + * columns */ List *indpred; /* predicate if a partial index, else NIL */ bool unique; /* true if a unique index */ @@ -413,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 @@ -425,7 +427,7 @@ typedef struct MaterialPath { Path path; Path *subpath; -} MaterialPath; +} MaterialPath; /* * UniquePath represents elimination of distinct rows from the output of @@ -442,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. @@ -661,7 +663,7 @@ typedef struct JoinInfo * relation includes all other relids appearing in those joinclauses. * The set of usable joinclauses, and thus the best inner indexscan, * thus varies depending on which outer relation we consider; so we have - * to recompute the best such path for every join. To avoid lots of + * to recompute the best such path for every join. To avoid lots of * redundant computation, we cache the results of such searches. For * each index we compute the set of possible otherrelids (all relids * appearing in joinquals that could become indexquals for this index). @@ -687,8 +689,8 @@ typedef struct InnerIndexscanInfo Relids other_relids; /* a set of relevant other relids */ bool isouterjoin; /* true if join is outer */ /* Best path for this lookup key: */ - Path *best_innerpath; /* best inner indexscan, or NULL if none */ -} InnerIndexscanInfo; + Path *best_innerpath; /* best inner indexscan, or NULL if none */ +} InnerIndexscanInfo; /* * IN clause info. @@ -704,11 +706,12 @@ typedef struct InClauseInfo NodeTag type; Relids lefthand; /* base relids in lefthand expressions */ Relids righthand; /* base relids coming from the subselect */ - List *sub_targetlist; /* targetlist of original RHS subquery */ + List *sub_targetlist; /* targetlist of original RHS subquery */ + /* - * Note: sub_targetlist is just a list of Vars or expressions; - * it does not contain TargetEntry nodes. + * 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 04add3c6f63..0384fafe972 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: clauses.h,v 1.65 2003/06/25 21:30:33 momjian Exp $ + * $Id: clauses.h,v 1.66 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ extern Expr *make_opclause(Oid opno, Oid opresulttype, bool opretset, - Expr *leftop, Expr *rightop); + Expr *leftop, Expr *rightop); extern Node *get_leftop(Expr *clause); extern Node *get_rightop(Expr *clause); @@ -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); @@ -70,18 +70,18 @@ extern Node *expression_tree_mutator(Node *node, Node *(*mutator) (), void *context); /* flags bits for query_tree_walker and query_tree_mutator */ -#define QTW_IGNORE_RT_SUBQUERIES 0x01 /* subqueries in rtable */ -#define QTW_IGNORE_JOINALIASES 0x02 /* JOIN alias var lists */ -#define QTW_DONT_COPY_QUERY 0x04 /* do not copy top Query */ +#define QTW_IGNORE_RT_SUBQUERIES 0x01 /* subqueries in rtable */ +#define QTW_IGNORE_JOINALIASES 0x02 /* JOIN alias var lists */ +#define QTW_DONT_COPY_QUERY 0x04 /* do not copy top Query */ extern bool query_tree_walker(Query *query, bool (*walker) (), - void *context, int flags); + void *context, int flags); extern Query *query_tree_mutator(Query *query, Node *(*mutator) (), - void *context, int flags); + void *context, int flags); extern bool query_or_expression_tree_walker(Node *node, bool (*walker) (), - void *context, int flags); + void *context, int flags); extern Node *query_or_expression_tree_mutator(Node *node, Node *(*mutator) (), - void *context, int flags); + void *context, int flags); #endif /* CLAUSES_H */ diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index ad2122f46e7..1f701019875 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: cost.h,v 1.54 2003/07/14 22:35:54 tgl Exp $ + * $Id: cost.h,v 1.55 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,20 +62,20 @@ extern void cost_functionscan(Path *path, Query *root, extern void cost_sort(Path *path, Query *root, List *pathkeys, Cost input_cost, double tuples, int width); extern void cost_material(Path *path, - Cost input_cost, double tuples, int width); + Cost input_cost, double tuples, int width); extern void cost_agg(Path *path, Query *root, - AggStrategy aggstrategy, int numAggs, - int numGroupCols, double numGroups, - Cost input_startup_cost, Cost input_total_cost, - double input_tuples); + AggStrategy aggstrategy, int numAggs, + int numGroupCols, double numGroups, + Cost input_startup_cost, Cost input_total_cost, + double input_tuples); extern void cost_group(Path *path, Query *root, - int numGroupCols, double numGroups, - Cost input_startup_cost, Cost input_total_cost, - double input_tuples); + int numGroupCols, double numGroups, + Cost input_startup_cost, Cost input_total_cost, + double input_tuples); 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, @@ -89,16 +89,16 @@ extern void set_function_size_estimates(Query *root, RelOptInfo *rel); * routines to compute clause selectivities */ extern Selectivity restrictlist_selectivity(Query *root, - List *restrictinfo_list, - int varRelid, - JoinType jointype); + List *restrictinfo_list, + int varRelid, + JoinType jointype); extern Selectivity clauselist_selectivity(Query *root, - List *clauses, - int varRelid, - JoinType jointype); + List *clauses, + int varRelid, + JoinType jointype); extern Selectivity clause_selectivity(Query *root, - Node *clause, - int varRelid, - JoinType jointype); + Node *clause, + int varRelid, + JoinType jointype); #endif /* COST_H */ diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index 5c276c0fb21..0db5f432340 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_misc.h,v 1.22 2002/11/06 00:00:45 tgl Exp $ + * $Id: geqo_misc.h,v 1.23 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,6 @@ extern void print_pool(FILE *fp, Pool *pool, int start, int stop); extern void print_gen(FILE *fp, Pool *pool, int generation); extern void print_edge_table(FILE *fp, Edge *edge_table, int num_gene); - #endif /* GEQO_DEBUG */ #endif /* GEQO_MISC_H */ diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h index 6fd806bbaf1..ae26e34d2aa 100644 --- a/src/include/optimizer/joininfo.h +++ b/src/include/optimizer/joininfo.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: joininfo.h,v 1.23 2003/01/24 03:58:43 tgl Exp $ + * $Id: joininfo.h,v 1.24 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,10 +21,10 @@ extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, Relids join_relids); extern JoinInfo *make_joininfo_node(RelOptInfo *this_rel, Relids join_relids); extern void add_join_clause_to_rels(Query *root, - RestrictInfo *restrictinfo, - Relids join_relids); + RestrictInfo *restrictinfo, + Relids join_relids); extern void remove_join_clause_from_rels(Query *root, - RestrictInfo *restrictinfo, - Relids join_relids); + RestrictInfo *restrictinfo, + Relids join_relids); #endif /* JOININFO_H */ diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index 6d112a5cf07..c7b3004eac1 100644 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pathnode.h,v 1.50 2003/02/15 20:12:41 tgl Exp $ + * $Id: pathnode.h,v 1.51 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,10 +37,10 @@ extern TidPath *create_tidscan_path(Query *root, RelOptInfo *rel, List *tideval); extern AppendPath *create_append_path(RelOptInfo *rel, List *subpaths); extern ResultPath *create_result_path(RelOptInfo *rel, Path *subpath, - List *constantqual); + List *constantqual); extern MaterialPath *create_material_path(RelOptInfo *rel, Path *subpath); extern UniquePath *create_unique_path(Query *root, RelOptInfo *rel, - Path *subpath); + Path *subpath); extern Path *create_subqueryscan_path(RelOptInfo *rel, List *pathkeys); extern Path *create_functionscan_path(Query *root, RelOptInfo *rel); @@ -78,10 +78,10 @@ extern void build_base_rel(Query *root, int relid); extern RelOptInfo *build_other_rel(Query *root, int relid); extern RelOptInfo *find_base_rel(Query *root, int relid); extern RelOptInfo *build_join_rel(Query *root, - Relids joinrelids, - RelOptInfo *outer_rel, - RelOptInfo *inner_rel, - JoinType jointype, - List **restrictlist_ptr); + Relids joinrelids, + RelOptInfo *outer_rel, + RelOptInfo *inner_rel, + JoinType jointype, + List **restrictlist_ptr); #endif /* PATHNODE_H */ diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index b36e17f91d7..b9be78c390a 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: paths.h,v 1.67 2003/05/26 00:11:28 tgl Exp $ + * $Id: paths.h,v 1.68 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,12 +37,12 @@ extern void debug_print_rel(Query *root, RelOptInfo *rel); */ extern void create_index_paths(Query *root, RelOptInfo *rel); extern Path *best_inner_indexscan(Query *root, RelOptInfo *rel, - Relids outer_relids, JoinType jointype); + Relids outer_relids, JoinType jointype); extern List *extract_or_indexqual_conditions(RelOptInfo *rel, IndexOptInfo *index, Expr *orsubclause); extern List *expand_indexqual_conditions(IndexOptInfo *index, - List *clausegroups); + List *clausegroups); /* * orindxpath.c @@ -73,8 +73,8 @@ extern void add_paths_to_joinrel(Query *root, RelOptInfo *joinrel, extern List *make_rels_by_joins(Query *root, int level, List **joinrels); extern RelOptInfo *make_jointree_rel(Query *root, Node *jtnode); extern RelOptInfo *make_join_rel(Query *root, - RelOptInfo *rel1, RelOptInfo *rel2, - JoinType jointype); + RelOptInfo *rel1, RelOptInfo *rel2, + JoinType jointype); /* * pathkeys.c @@ -106,7 +106,7 @@ extern List *build_index_pathkeys(Query *root, RelOptInfo *rel, IndexOptInfo *index, ScanDirection scandir); extern List *build_subquery_pathkeys(Query *root, RelOptInfo *rel, - Query *subquery); + Query *subquery); extern List *build_join_pathkeys(Query *root, RelOptInfo *joinrel, List *outer_pathkeys); diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index 8f7cfbe6ceb..004ba12d6e4 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: plancat.h,v 1.30 2003/06/29 23:05:05 tgl Exp $ + * $Id: plancat.h,v 1.31 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,8 +33,8 @@ extern Selectivity restriction_selectivity(Query *root, int varRelid); extern Selectivity join_selectivity(Query *root, - Oid operator, - List *args, - JoinType jointype); + Oid operator, + List *args, + JoinType jointype); #endif /* PLANCAT_H */ diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 99c9470493d..8f8022dc127 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: planmain.h,v 1.72 2003/06/29 23:05:05 tgl Exp $ + * $Id: planmain.h,v 1.73 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ * prototypes for plan/planmain.c */ extern void query_planner(Query *root, List *tlist, double tuple_fraction, - Path **cheapest_path, Path **sorted_path); + Path **cheapest_path, Path **sorted_path); /* * prototypes for plan/createplan.c @@ -31,18 +31,18 @@ extern SubqueryScan *make_subqueryscan(List *qptlist, List *qpqual, Index scanrelid, Plan *subplan); extern Append *make_append(List *appendplans, bool isTarget, List *tlist); extern Sort *make_sort_from_sortclauses(Query *root, List *tlist, - Plan *lefttree, List *sortcls); + Plan *lefttree, List *sortcls); extern Sort *make_sort_from_groupcols(Query *root, List *groupcls, - AttrNumber *grpColIdx, Plan *lefttree); + AttrNumber *grpColIdx, Plan *lefttree); extern Agg *make_agg(Query *root, List *tlist, List *qual, - AggStrategy aggstrategy, - int numGroupCols, AttrNumber *grpColIdx, - long numGroups, int numAggs, - Plan *lefttree); + AggStrategy aggstrategy, + int numGroupCols, AttrNumber *grpColIdx, + long numGroups, int numAggs, + Plan *lefttree); extern Group *make_group(Query *root, List *tlist, - int numGroupCols, AttrNumber *grpColIdx, - double numGroups, - Plan *lefttree); + int numGroupCols, AttrNumber *grpColIdx, + double numGroups, + Plan *lefttree); extern Material *make_material(List *tlist, Plan *lefttree); extern Plan *materialize_finished_plan(Plan *subplan); extern Unique *make_unique(List *tlist, Plan *lefttree, List *distinctList); @@ -59,16 +59,16 @@ extern void add_base_rels_to_query(Query *root, Node *jtnode); extern void build_base_rel_tlists(Query *root, List *final_tlist); extern Relids distribute_quals_to_rels(Query *root, Node *jtnode); extern void process_implied_equality(Query *root, - Node *item1, Node *item2, - Oid sortop1, Oid sortop2, - Relids item1_relids, Relids item2_relids, - bool delete_it); + Node *item1, Node *item2, + Oid sortop1, Oid sortop2, + Relids item1_relids, Relids item2_relids, + bool delete_it); /* * prototypes for plan/setrefs.c */ 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/optimizer/prep.h b/src/include/optimizer/prep.h index 52d045c51a4..f25a3c79e33 100644 --- a/src/include/optimizer/prep.h +++ b/src/include/optimizer/prep.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: prep.h,v 1.39 2003/04/24 23:43:09 tgl Exp $ + * $Id: prep.h,v 1.40 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,7 +53,7 @@ extern Plan *plan_set_operations(Query *parse); extern List *find_all_inheritors(Oid parentrel); extern List *expand_inherited_rtentry(Query *parse, Index rti, - bool dup_parent); + bool dup_parent); extern Node *adjust_inherited_attrs(Node *node, Index old_rt_index, Oid old_relid, diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h index 19c3435c3e5..c4a04bf9485 100644 --- a/src/include/optimizer/restrictinfo.h +++ b/src/include/optimizer/restrictinfo.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: restrictinfo.h,v 1.17 2003/06/15 22:51:45 tgl Exp $ + * $Id: restrictinfo.h,v 1.18 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,11 +21,11 @@ extern List *get_actual_clauses(List *restrictinfo_list); extern void get_actual_join_clauses(List *restrictinfo_list, List **joinquals, List **otherquals); extern List *remove_redundant_join_clauses(Query *root, - List *restrictinfo_list, - JoinType jointype); + List *restrictinfo_list, + JoinType jointype); extern List *select_nonredundant_join_clauses(Query *root, - List *restrictinfo_list, - List *reference_list, - JoinType jointype); + List *restrictinfo_list, + List *reference_list, + JoinType jointype); #endif /* RESTRICTINFO_H */ diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index d22c78f8d8e..cdca747f7b9 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tlist.h,v 1.36 2003/06/29 23:05:05 tgl Exp $ + * $Id: tlist.h,v 1.37 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,6 +30,6 @@ extern TargetEntry *get_sortgroupclause_tle(SortClause *sortClause, extern Node *get_sortgroupclause_expr(SortClause *sortClause, List *targetList); extern List *get_sortgrouplist_exprs(List *sortClauses, - List *targetList); + List *targetList); #endif /* TLIST_H */ diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index b7d6a7d6658..1b97706e0fb 100644 --- a/src/include/parser/analyze.h +++ b/src/include/parser/analyze.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: analyze.h,v 1.21 2003/04/29 22:13:11 tgl Exp $ + * $Id: analyze.h,v 1.22 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ extern List *parse_analyze(Node *parseTree, Oid *paramTypes, int numParams); extern List *parse_analyze_varparams(Node *parseTree, Oid **paramTypes, - int *numParams); + int *numParams); extern List *parse_sub_analyze(Node *parseTree, ParseState *parentParseState); extern List *analyzeCreateSchemaStmt(CreateSchemaStmt *stmt); diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index 79f226fb89f..4b8ab5d427b 100644 --- a/src/include/parser/parse_agg.h +++ b/src/include/parser/parse_agg.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_agg.h,v 1.27 2003/07/01 19:10:53 tgl Exp $ + * $Id: parse_agg.h,v 1.28 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,11 +20,11 @@ extern void transformAggregateCall(ParseState *pstate, Aggref *agg); extern void parseCheckAggregates(ParseState *pstate, Query *qry); extern void build_aggregate_fnexprs(Oid agg_input_type, - Oid agg_state_type, - Oid agg_result_type, - Oid transfn_oid, - Oid finalfn_oid, - Expr **transfnexpr, - Expr **finalfnexpr); + Oid agg_state_type, + Oid agg_result_type, + Oid transfn_oid, + Oid finalfn_oid, + Expr **transfnexpr, + Expr **finalfnexpr); #endif /* PARSE_AGG_H */ diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h index 6f4f87a8b66..d7d8a16e967 100644 --- a/src/include/parser/parse_clause.h +++ b/src/include/parser/parse_clause.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_clause.h,v 1.33 2003/07/03 19:07:53 tgl Exp $ + * $Id: parse_clause.h,v 1.34 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,9 +22,9 @@ extern int setTargetTable(ParseState *pstate, RangeVar *relation, extern bool interpretInhOption(InhOption inhOpt); extern Node *transformWhereClause(ParseState *pstate, Node *clause, - const char *constructName); + const char *constructName); extern Node *transformLimitClause(ParseState *pstate, Node *clause, - const char *constructName); + const char *constructName); extern List *transformGroupClause(ParseState *pstate, List *grouplist, List *targetlist, List *sortClause); extern List *transformSortClause(ParseState *pstate, List *orderlist, @@ -33,8 +33,8 @@ extern List *transformDistinctClause(ParseState *pstate, List *distinctlist, List *targetlist, List **sortClause); extern List *addAllTargetsToSortList(ParseState *pstate, - List *sortlist, List *targetlist, - bool resolveUnknown); + List *sortlist, List *targetlist, + bool resolveUnknown); extern Index assignSortGroupRef(TargetEntry *tle, List *tlist); extern bool targetIsInSortList(TargetEntry *tle, List *sortList); diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index 88d7b614bb9..36c5c7eaf23 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_coerce.h,v 1.53 2003/07/03 19:07:54 tgl Exp $ + * $Id: parse_coerce.h,v 1.54 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,42 +40,42 @@ extern bool IsPreferredType(CATEGORY category, Oid type); extern CATEGORY TypeCategory(Oid type); extern Node *coerce_to_target_type(ParseState *pstate, - Node *expr, Oid exprtype, - Oid targettype, int32 targettypmod, - CoercionContext ccontext, - CoercionForm cformat); + Node *expr, Oid exprtype, + Oid targettype, int32 targettypmod, + CoercionContext ccontext, + CoercionForm cformat); extern bool can_coerce_type(int nargs, Oid *input_typeids, Oid *target_typeids, - CoercionContext ccontext); + CoercionContext ccontext); extern Node *coerce_type(ParseState *pstate, Node *node, - Oid inputTypeId, Oid targetTypeId, - CoercionContext ccontext, CoercionForm cformat); + Oid inputTypeId, Oid targetTypeId, + CoercionContext ccontext, CoercionForm cformat); extern Node *coerce_to_domain(Node *arg, Oid baseTypeId, Oid typeId, - CoercionForm cformat); + CoercionForm cformat); extern Node *coerce_to_boolean(ParseState *pstate, Node *node, - const char *constructName); + const char *constructName); extern Node *coerce_to_integer(ParseState *pstate, Node *node, - const char *constructName); + const char *constructName); extern Oid select_common_type(List *typeids, const char *context); extern Node *coerce_to_common_type(ParseState *pstate, Node *node, - Oid targetTypeId, - const char *context); + Oid targetTypeId, + const char *context); extern bool check_generic_type_consistency(Oid *actual_arg_types, - Oid *declared_arg_types, - int nargs); + Oid *declared_arg_types, + int nargs); extern Oid enforce_generic_type_consistency(Oid *actual_arg_types, - Oid *declared_arg_types, - int nargs, - Oid rettype); + Oid *declared_arg_types, + int nargs, + Oid rettype); extern Oid resolve_generic_type(Oid declared_type, - Oid context_actual_type, - Oid context_declared_type); + Oid context_actual_type, + Oid context_declared_type); extern bool find_coercion_pathway(Oid targetTypeId, Oid sourceTypeId, - CoercionContext ccontext, - Oid *funcid); + CoercionContext ccontext, + Oid *funcid); extern Oid find_typmod_coercion_function(Oid typeId, int *nargs); #endif /* PARSE_COERCE_H */ diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index d4046b988f0..9393c1aaa4c 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_func.h,v 1.48 2003/07/20 21:56:35 tgl Exp $ + * $Id: parse_func.h,v 1.49 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -50,32 +50,32 @@ extern FuncDetailCode func_get_detail(List *funcname, List *fargs, Oid *funcid, Oid *rettype, bool *retset, Oid **true_typeids); -extern int func_match_argtypes(int nargs, - Oid *input_typeids, - FuncCandidateList raw_candidates, - FuncCandidateList *candidates); +extern int func_match_argtypes(int nargs, + Oid *input_typeids, + FuncCandidateList raw_candidates, + FuncCandidateList *candidates); extern FuncCandidateList func_select_candidate(int nargs, - Oid *input_typeids, - FuncCandidateList candidates); + Oid *input_typeids, + FuncCandidateList candidates); extern bool typeInheritsFrom(Oid subclassTypeId, Oid superclassTypeId); extern void make_fn_arguments(ParseState *pstate, - List *fargs, - Oid *actual_arg_types, - Oid *declared_arg_types); + List *fargs, + Oid *actual_arg_types, + Oid *declared_arg_types); extern const char *funcname_signature_string(const char *funcname, - int nargs, const Oid *argtypes); + int nargs, const Oid *argtypes); extern const char *func_signature_string(List *funcname, - int nargs, const Oid *argtypes); + int nargs, const Oid *argtypes); -extern Oid find_aggregate_func(List *aggname, Oid basetype, bool noError); +extern Oid find_aggregate_func(List *aggname, Oid basetype, bool noError); -extern Oid LookupFuncName(List *funcname, int nargs, const Oid *argtypes, - bool noError); +extern Oid LookupFuncName(List *funcname, int nargs, const Oid *argtypes, + bool noError); extern Oid LookupFuncNameTypeNames(List *funcname, List *argtypes, - bool noError); + bool noError); #endif /* PARSE_FUNC_H */ diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index 1f52963e5c0..339a07ae0c1 100644 --- a/src/include/parser/parse_node.h +++ b/src/include/parser/parse_node.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_node.h,v 1.35 2003/04/29 22:13:11 tgl Exp $ + * $Id: parse_node.h,v 1.36 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -54,7 +54,8 @@ typedef struct ParseState int p_numparams; /* allocated size of p_paramtypes[] */ int p_next_resno; /* next targetlist resno to assign */ List *p_forUpdate; /* FOR UPDATE clause, if any (see gram.y) */ - Node *p_value_substitute; /* what to replace VALUE with, if any */ + Node *p_value_substitute; /* what to replace VALUE with, if + * any */ bool p_variableparams; bool p_hasAggs; bool p_hasSubLinks; diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h index a53b1a5a23e..e2d43f165a6 100644 --- a/src/include/parser/parse_oper.h +++ b/src/include/parser/parse_oper.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_oper.h,v 1.30 2003/07/04 02:51:34 tgl Exp $ + * $Id: parse_oper.h,v 1.31 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,10 +21,10 @@ typedef HeapTuple Operator; /* Routines to look up an operator given name and exact input type(s) */ -extern Oid LookupOperName(List *opername, Oid oprleft, Oid oprright, - bool noError); +extern Oid LookupOperName(List *opername, Oid oprleft, Oid oprright, + bool noError); extern Oid LookupOperNameTypeNames(List *opername, TypeName *oprleft, - TypeName *oprright, bool noError); + TypeName *oprright, bool noError); /* Routines to find operators matching a name and given input types */ /* NB: the selected operator may require coercion of the input types! */ @@ -54,12 +54,12 @@ extern Oid oprfuncid(Operator op); /* Build expression tree for an operator invocation */ extern Expr *make_op(ParseState *pstate, List *opname, - Node *ltree, Node *rtree); + Node *ltree, Node *rtree); extern Expr *make_scalar_array_op(ParseState *pstate, List *opname, - bool useOr, - Node *ltree, Node *rtree); + bool useOr, + Node *ltree, Node *rtree); extern Expr *make_op_expr(ParseState *pstate, Operator op, - Node *ltree, Node *rtree, - Oid ltypeId, Oid rtypeId); + Node *ltree, Node *rtree, + Oid ltypeId, Oid rtypeId); #endif /* PARSE_OPER_H */ diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index 3bf316a5805..451ef351e65 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -3,10 +3,10 @@ * * This file contains various configuration symbols and limits. In * all cases, changing them is only useful in very rare situations or - * for developers. If you edit any of these, be sure to do a *full* + * for developers. If you edit any of these, be sure to do a *full* * rebuild (and an initdb if noted). * - * $Id: pg_config_manual.h,v 1.4 2003/06/12 07:36:51 momjian Exp $ + * $Id: pg_config_manual.h,v 1.5 2003/08/04 00:43:29 momjian Exp $ *------------------------------------------------------------------------ */ @@ -41,7 +41,7 @@ * * Changing RELSEG_SIZE requires an initdb. */ -#define RELSEG_SIZE (0x40000000 / BLCKSZ) +#define RELSEG_SIZE (0x40000000 / BLCKSZ) /* * Maximum number of columns in an index and maximum number of @@ -59,7 +59,7 @@ /* * Define this to make libpgtcl's "pg_result -assign" command process * C-style backslash sequences in returned tuple data and convert - * PostgreSQL array values into Tcl lists. CAUTION: This conversion + * PostgreSQL array values into Tcl lists. CAUTION: This conversion * is *wrong* unless you install the routines in * contrib/string/string_io to make the server produce C-style * backslash sequences in the first place. @@ -69,7 +69,7 @@ /* * User locks are handled totally on the application side as long term * cooperative locks which extend beyond the normal transaction - * boundaries. Their purpose is to indicate to an application that + * boundaries. Their purpose is to indicate to an application that * someone is `working' on an item. Define this flag to enable user * locks. You will need the loadable module user-locks.c to use this * feature. @@ -84,8 +84,8 @@ /* * Define this if you want to allow the lo_import and lo_export SQL - * functions to be executed by ordinary users. By default these - * functions are only available to the Postgres superuser. CAUTION: + * functions to be executed by ordinary users. By default these + * functions are only available to the Postgres superuser. CAUTION: * These functions are SECURITY HOLES since they can read and write * any file that the PostgreSQL server has permission to access. If * you turn this on, don't say we didn't warn you. @@ -130,7 +130,7 @@ * Disable UNIX sockets for those operating system. */ #if defined(__QNX__) || defined(__BEOS__) || defined(WIN32) -# undef HAVE_UNIX_SOCKETS +#undef HAVE_UNIX_SOCKETS #endif /* @@ -138,20 +138,20 @@ */ #if !defined(__QNX__) && !defined(__BEOS__) && \ !defined(__CYGWIN__) && !defined(WIN32) -# define HAVE_WORKING_LINK 1 +#define HAVE_WORKING_LINK 1 #endif - + /* * Define this if your operating system has _timezone rather than timezone */ #if defined(__CYGWIN__) || defined(WIN32) -# define HAVE_INT_TIMEZONE /* has int _timezone */ -# define HAVE_UNDERSCORE_TIMEZONE 1 +#define HAVE_INT_TIMEZONE /* has int _timezone */ +#define HAVE_UNDERSCORE_TIMEZONE 1 #endif - + /* * This is the default directory in which AF_UNIX socket files are - * placed. Caution: changing this risks breaking your existing client + * placed. Caution: changing this risks breaking your existing client * applications, which are likely to continue to look in the old * directory. But if you just hate the idea of sockets in /tmp, * here's where to twiddle it. You can also override this at runtime @@ -170,7 +170,7 @@ * MAX_RANDOM_VALUE. Currently, all known implementations yield * 0..2^31-1, so we just hardwire this constant. We could do a * configure test if it proves to be necessary. CAUTION: Think not to - * replace this with RAND_MAX. RAND_MAX defines the maximum value of + * replace this with RAND_MAX. RAND_MAX defines the maximum value of * the older rand() function, which is often different from --- and * considerably inferior to --- random(). */ @@ -187,7 +187,7 @@ /* * Define this to cause pfree()'d memory to be cleared immediately, to * facilitate catching bugs that refer to already-freed values. XXX - * Right now, this gets defined automatically if --enable-cassert. In + * Right now, this gets defined automatically if --enable-cassert. In * the long term it probably doesn't need to be on by default. */ #ifdef USE_ASSERT_CHECKING @@ -196,11 +196,11 @@ /* * Define this to check memory allocation errors (scribbling on more - * bytes than were allocated). Right now, this gets defined + * bytes than were allocated). Right now, this gets defined * automatically if --enable-cassert. In the long term it probably * doesn't need to be on by default. */ -#ifdef USE_ASSERT_CHECKING +#ifdef USE_ASSERT_CHECKING #define MEMORY_CONTEXT_CHECKING #endif @@ -221,7 +221,7 @@ */ /* #define IPORTAL_DEBUG */ /* #define HEAPDEBUGALL */ -/* #define ISTRATDEBUG */ +/* #define ISTRATDEBUG */ /* #define ACLDEBUG */ /* #define RTDEBUG */ /* #define GISTDEBUG */ diff --git a/src/include/pgstat.h b/src/include/pgstat.h index 568cf878e47..cc76d67d646 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -5,7 +5,7 @@ * * Copyright (c) 2001-2003, PostgreSQL Global Development Group * - * $Id: pgstat.h,v 1.15 2003/04/27 20:09:44 tgl Exp $ + * $Id: pgstat.h,v 1.16 2003/08/04 00:43:29 momjian Exp $ * ---------- */ #ifndef PGSTAT_H @@ -38,7 +38,7 @@ #define PGSTAT_DESTROY_COUNT (PGSTAT_DESTROY_DELAY / PGSTAT_STAT_INTERVAL) -#define PGSTAT_RESTART_INTERVAL 60 /* How often to attempt to restart */ +#define PGSTAT_RESTART_INTERVAL 60 /* How often to attempt to restart */ /* a failed statistics collector; in seconds. */ /* ---------- diff --git a/src/include/port.h b/src/include/port.h index c1bbfd718c7..972f886f40a 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: port.h,v 1.8 2003/06/24 00:44:29 momjian Exp $ + * $Id: port.h,v 1.9 2003/08/04 00:43:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,14 +18,14 @@ #endif /* Portable path handling for Unix/Win32 */ -bool is_absolute_path(const char *filename); -char *first_path_separator(const char *filename); -char *last_path_separator(const char *filename); -char *get_progname(char *argv0); +bool is_absolute_path(const char *filename); +char *first_path_separator(const char *filename); +char *last_path_separator(const char *filename); +char *get_progname(char *argv0); #if defined(bsdi) || defined(netbsd) -int fseeko(FILE *stream, off_t offset, int whence); -off_t ftello(FILE *stream); +int fseeko(FILE *stream, off_t offset, int whence); +off_t ftello(FILE *stream); #endif #ifdef WIN32 @@ -33,15 +33,17 @@ off_t ftello(FILE *stream); * Win32 doesn't have reliable rename/unlink during concurrent access */ #ifndef FRONTEND -int pgrename(const char *from, const char *to); -int pgunlink(const char *path); +int pgrename(const char *from, const char *to); +int pgunlink(const char *path); + #define rename(from, to) pgrename(from, to) #define unlink(path) pgunlink(path) #endif -extern int copydir(char *fromdir,char *todir); +extern int copydir(char *fromdir, char *todir); + /* Last parameter not used */ -extern int gettimeofday(struct timeval *tp, struct timezone *tzp); +extern int gettimeofday(struct timeval * tp, struct timezone * tzp); #else @@ -49,9 +51,9 @@ extern int gettimeofday(struct timeval *tp, struct timezone *tzp); * Win32 requires a special close for sockets and pipes, while on Unix * close() does them all. */ -#define closesocket close +#define closesocket close #endif - + /* * Default "extern" declarations or macro substitutes for library routines. * When necessary, these routines are provided by files in src/port/. @@ -66,15 +68,15 @@ extern char *crypt(const char *key, const char *setting); #endif #ifndef HAVE_GETOPT -extern int getopt(int nargc, char *const *nargv, const char *ostr); +extern int getopt(int nargc, char *const * nargv, const char *ostr); #endif #ifndef HAVE_ISINF -extern int isinf(double x); +extern int isinf(double x); #endif #if !defined(HAVE_GETHOSTNAME) && defined(KRB4) -extern int gethostname(char *name, int namelen); +extern int gethostname(char *name, int namelen); #endif #ifndef HAVE_RINT @@ -83,14 +85,14 @@ extern double rint(double x); #ifndef HAVE_INET_ATON #if !defined(_MSC_VER) && !defined(__BORLANDC__) -# include <netinet/in.h> -# include <arpa/inet.h> +#include <netinet/in.h> +#include <arpa/inet.h> #endif -extern int inet_aton(const char *cp, struct in_addr * addr); +extern int inet_aton(const char *cp, struct in_addr * addr); #endif #ifndef HAVE_STRCASECMP -extern int strcasecmp(char *s1, char *s2); +extern int strcasecmp(char *s1, char *s2); #endif #ifndef HAVE_STRDUP @@ -108,11 +110,11 @@ extern void srandom(unsigned int seed); /* thread.h */ extern char *pqStrerror(int errnum, char *strerrbuf, size_t buflen); -extern int pqGetpwuid(uid_t uid, struct passwd *resultbuf, char *buffer, - size_t buflen, struct passwd **result); +extern int pqGetpwuid(uid_t uid, struct passwd * resultbuf, char *buffer, + size_t buflen, struct passwd ** result); extern int pqGethostbyname(const char *name, - struct hostent *resbuf, - char *buf, size_t buflen, - struct hostent **result, - int *herrno); + struct hostent * resbuf, + char *buf, size_t buflen, + struct hostent ** result, + int *herrno); diff --git a/src/include/port/bsdi.h b/src/include/port/bsdi.h index 3a2aa59d096..f4865361132 100644 --- a/src/include/port/bsdi.h +++ b/src/include/port/bsdi.h @@ -8,4 +8,3 @@ #define HAS_TEST_AND_SET typedef unsigned char slock_t; - diff --git a/src/include/port/cygwin.h b/src/include/port/cygwin.h index c703f59c62b..2b818941ef0 100644 --- a/src/include/port/cygwin.h +++ b/src/include/port/cygwin.h @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/include/port/cygwin.h,v 1.3 2003/05/22 17:20:28 petere Exp $ */ +/* $Header: /cvsroot/pgsql/src/include/port/cygwin.h,v 1.4 2003/08/04 00:43:32 momjian Exp $ */ #define HAS_TEST_AND_SET typedef unsigned char slock_t; @@ -20,4 +20,5 @@ typedef unsigned char slock_t; #define DLLIMPORT __declspec (dllexport) #else #define DLLIMPORT __declspec (dllimport) + #endif diff --git a/src/include/port/freebsd.h b/src/include/port/freebsd.h index aba5c72fe62..7729fa5b9bb 100644 --- a/src/include/port/freebsd.h +++ b/src/include/port/freebsd.h @@ -44,4 +44,5 @@ typedef unsigned long slock_t; #if defined(__powerpc__) #define HAS_TEST_AND_SET typedef unsigned int slock_t; + #endif diff --git a/src/include/port/hpux.h b/src/include/port/hpux.h index 83296d852ec..28883ad4b10 100644 --- a/src/include/port/hpux.h +++ b/src/include/port/hpux.h @@ -31,4 +31,5 @@ typedef unsigned int slock_t; #else #error unrecognized CPU type for HP-UX + #endif diff --git a/src/include/port/netbsd.h b/src/include/port/netbsd.h index aba5c72fe62..7729fa5b9bb 100644 --- a/src/include/port/netbsd.h +++ b/src/include/port/netbsd.h @@ -44,4 +44,5 @@ typedef unsigned long slock_t; #if defined(__powerpc__) #define HAS_TEST_AND_SET typedef unsigned int slock_t; + #endif diff --git a/src/include/port/openbsd.h b/src/include/port/openbsd.h index aba5c72fe62..7729fa5b9bb 100644 --- a/src/include/port/openbsd.h +++ b/src/include/port/openbsd.h @@ -44,4 +44,5 @@ typedef unsigned long slock_t; #if defined(__powerpc__) #define HAS_TEST_AND_SET typedef unsigned int slock_t; + #endif diff --git a/src/include/port/win32.h b/src/include/port/win32.h index 747a2d757c8..7ffff9b3031 100644 --- a/src/include/port/win32.h +++ b/src/include/port/win32.h @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/include/port/win32.h,v 1.11 2003/05/16 04:59:22 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/include/port/win32.h,v 1.12 2003/08/04 00:43:32 momjian Exp $ */ /* undefine and redefine after #include */ #undef mkdir @@ -38,7 +38,6 @@ #else /* not CYGWIN, not MSVC */ #define DLLIMPORT - #endif /* @@ -68,14 +67,14 @@ */ struct shmid_ds { - int dummy; - int shm_nattch; + int dummy; + int shm_nattch; }; -int shmdt(const void *shmaddr); -void* shmat(int memId, void* shmaddr, int flag); -int shmctl(int shmid, int flag, struct shmid_ds * dummy); -int shmget(int memKey, int size, int flag); +int shmdt(const void *shmaddr); +void *shmat(int memId, void *shmaddr, int flag); +int shmctl(int shmid, int flag, struct shmid_ds * dummy); +int shmget(int memKey, int size, int flag); /* @@ -83,45 +82,46 @@ int shmget(int memKey, int size, int flag); */ union semun { - int val; + int val; struct semid_ds *buf; unsigned short *array; }; struct sembuf { - int sem_flg; - int sem_op; - int sem_num; + int sem_flg; + int sem_op; + int sem_num; }; -int semctl(int semId, int semNum, int flag, union semun); -int semget(int semKey, int semNum, int flags); -int semop(int semId, struct sembuf * sops, int flag); +int semctl(int semId, int semNum, int flag, union semun); +int semget(int semKey, int semNum, int flags); +int semop(int semId, struct sembuf * sops, int flag); #define sleep(sec) (Sleep(sec * 1000), /* no return value */ 0) /* Some extra signals */ #define SIGHUP 1 -#define SIGQUIT 3 -#define SIGTRAP 5 -#define SIGABRT 22 /* Set to match W32 value -- not UNIX value */ -#define SIGKILL 9 -#define SIGPIPE 13 -#define SIGALRM 14 -#define SIGSTOP 17 -#define SIGCONT 19 -#define SIGCHLD 20 -#define SIGTTIN 21 -#define SIGTTOU 22 /* Same as SIGABRT -- no problem, I hope */ -#define SIGWINCH 28 -#define SIGUSR1 30 -#define SIGUSR2 31 +#define SIGQUIT 3 +#define SIGTRAP 5 +#define SIGABRT 22 /* Set to match W32 value -- not UNIX + * value */ +#define SIGKILL 9 +#define SIGPIPE 13 +#define SIGALRM 14 +#define SIGSTOP 17 +#define SIGCONT 19 +#define SIGCHLD 20 +#define SIGTTIN 21 +#define SIGTTOU 22 /* Same as SIGABRT -- no problem, I hope */ +#define SIGWINCH 28 +#define SIGUSR1 30 +#define SIGUSR2 31 struct timezone { - int tz_minuteswest; /* Minutes west of GMT. */ - int tz_dsttime; /* Nonzero if DST is ever in effect. */ + int tz_minuteswest; /* Minutes west of GMT. */ + int tz_dsttime; /* Nonzero if DST is ever in effect. */ }; /* FROM SRA */ @@ -163,4 +163,3 @@ struct timezone #define EWOULDBLOCK WSAEWOULDBLOCK #define ECONNRESET WSAECONNRESET #define EINPROGRESS WSAEINPROGRESS - diff --git a/src/include/port/win32/dlfcn.h b/src/include/port/win32/dlfcn.h index e69de29bb2d..8b137891791 100644 --- a/src/include/port/win32/dlfcn.h +++ b/src/include/port/win32/dlfcn.h @@ -0,0 +1 @@ + diff --git a/src/include/port/win32/grp.h b/src/include/port/win32/grp.h index e69de29bb2d..8b137891791 100644 --- a/src/include/port/win32/grp.h +++ b/src/include/port/win32/grp.h @@ -0,0 +1 @@ + diff --git a/src/include/port/win32/netdb.h b/src/include/port/win32/netdb.h index e69de29bb2d..8b137891791 100644 --- a/src/include/port/win32/netdb.h +++ b/src/include/port/win32/netdb.h @@ -0,0 +1 @@ + diff --git a/src/include/port/win32/netinet/in.h b/src/include/port/win32/netinet/in.h index 52db5248cb7..dc979c05372 100644 --- a/src/include/port/win32/netinet/in.h +++ b/src/include/port/win32/netinet/in.h @@ -1,2 +1 @@ #include <sys/socket.h> - diff --git a/src/include/port/win32/pwd.h b/src/include/port/win32/pwd.h index e69de29bb2d..8b137891791 100644 --- a/src/include/port/win32/pwd.h +++ b/src/include/port/win32/pwd.h @@ -0,0 +1 @@ + diff --git a/src/include/port/win32/sys/socket.h b/src/include/port/win32/sys/socket.h index 93df14ed7ce..86950699e4d 100644 --- a/src/include/port/win32/sys/socket.h +++ b/src/include/port/win32/sys/socket.h @@ -12,4 +12,5 @@ /* Restore old ERROR value */ #ifdef PGERROR #define ERROR PGERROR + #endif diff --git a/src/include/port/win32/sys/wait.h b/src/include/port/win32/sys/wait.h index e69de29bb2d..8b137891791 100644 --- a/src/include/port/win32/sys/wait.h +++ b/src/include/port/win32/sys/wait.h @@ -0,0 +1 @@ + diff --git a/src/include/postgres.h b/src/include/postgres.h index 3d2da911d27..8c40afc9564 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $Id: postgres.h,v 1.63 2003/04/06 22:45:23 petere Exp $ + * $Id: postgres.h,v 1.64 2003/08/04 00:43:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -130,6 +130,7 @@ typedef struct varattrib */ typedef unsigned long Datum; /* XXX sizeof(long) >= sizeof(void *) */ + #define SIZEOF_DATUM SIZEOF_UNSIGNED_LONG typedef Datum *DatumPtr; diff --git a/src/include/regex/regcustom.h b/src/include/regex/regcustom.h index 305243296ff..1089126a3ac 100644 --- a/src/include/regex/regcustom.h +++ b/src/include/regex/regcustom.h @@ -1,19 +1,19 @@ /* - * Copyright (c) 1998, 1999 Henry Spencer. All rights reserved. - * + * Copyright (c) 1998, 1999 Henry Spencer. All rights reserved. + * * Development of this software was funded, in part, by Cray Research Inc., * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics * Corporation, none of whom are responsible for the results. The author - * thanks all of them. - * + * thanks all of them. + * * Redistribution and use in source and binary forms -- with or without * modification -- are permitted for any purpose, provided that * redistributions in source form retain this entire copyright notice and * indicate the origin and nature of any modifications. - * + * * I'd appreciate being given credit for this package in the documentation * of software which uses it, but that is not a requirement. - * + * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL @@ -25,7 +25,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: regcustom.h,v 1.1 2003/02/05 17:41:32 tgl Exp $ + * $Id: regcustom.h,v 1.2 2003/08/04 00:43:32 momjian Exp $ */ /* headers if any */ @@ -38,27 +38,31 @@ /* overrides for regguts.h definitions, if any */ -#define FUNCPTR(name, args) (*name) args -#define MALLOC(n) malloc(n) -#define FREE(p) free(VS(p)) -#define REALLOC(p,n) realloc(VS(p),n) +#define FUNCPTR(name, args) (*name) args +#define MALLOC(n) malloc(n) +#define FREE(p) free(VS(p)) +#define REALLOC(p,n) realloc(VS(p),n) /* internal character type and related */ -typedef pg_wchar chr; /* the type itself */ -typedef unsigned uchr; /* unsigned type that will hold a chr */ -typedef int celt; /* type to hold chr, MCCE number, or NOCELT */ -#define NOCELT (-1) /* celt value which is not valid chr or MCCE */ -#define CHR(c) ((unsigned char) (c)) /* turn char literal into chr literal */ -#define DIGITVAL(c) ((c)-'0') /* turn chr digit into its value */ -#define CHRBITS 32 /* bits in a chr; must not use sizeof */ -#define CHR_MIN 0x00000000 /* smallest and largest chr; the value */ -#define CHR_MAX 0xfffffffe /* CHR_MAX-CHR_MIN+1 should fit in uchr */ +typedef pg_wchar chr; /* the type itself */ +typedef unsigned uchr; /* unsigned type that will hold a chr */ +typedef int celt; /* type to hold chr, MCCE number, or + * NOCELT */ + +#define NOCELT (-1) /* celt value which is not valid chr or + * MCCE */ +#define CHR(c) ((unsigned char) (c)) /* turn char literal into chr + * literal */ +#define DIGITVAL(c) ((c)-'0') /* turn chr digit into its value */ +#define CHRBITS 32 /* bits in a chr; must not use sizeof */ +#define CHR_MIN 0x00000000 /* smallest and largest chr; the value */ +#define CHR_MAX 0xfffffffe /* CHR_MAX-CHR_MIN+1 should fit in uchr */ /* functions operating on chr */ -#define iscalnum(x) pg_isalnum(x) -#define iscalpha(x) pg_isalpha(x) -#define iscdigit(x) pg_isdigit(x) -#define iscspace(x) pg_isspace(x) +#define iscalnum(x) pg_isalnum(x) +#define iscalpha(x) pg_isalpha(x) +#define iscdigit(x) pg_isdigit(x) +#define iscspace(x) pg_isspace(x) /* and pick up the standard header */ #include "regex.h" diff --git a/src/include/regex/regerrs.h b/src/include/regex/regerrs.h index 4b1a0541b51..fbf911fdf2a 100644 --- a/src/include/regex/regerrs.h +++ b/src/include/regex/regerrs.h @@ -1,22 +1,75 @@ /* - * $Id: regerrs.h,v 1.1 2003/02/05 17:41:32 tgl Exp $ + * $Id: regerrs.h,v 1.2 2003/08/04 00:43:32 momjian Exp $ */ -{ REG_OKAY, "REG_OKAY", "no errors detected" }, -{ REG_NOMATCH, "REG_NOMATCH", "failed to match" }, -{ REG_BADPAT, "REG_BADPAT", "invalid regexp (reg version 0.8)" }, -{ REG_ECOLLATE, "REG_ECOLLATE", "invalid collating element" }, -{ REG_ECTYPE, "REG_ECTYPE", "invalid character class" }, -{ REG_EESCAPE, "REG_EESCAPE", "invalid escape \\ sequence" }, -{ REG_ESUBREG, "REG_ESUBREG", "invalid backreference number" }, -{ REG_EBRACK, "REG_EBRACK", "brackets [] not balanced" }, -{ REG_EPAREN, "REG_EPAREN", "parentheses () not balanced" }, -{ REG_EBRACE, "REG_EBRACE", "braces {} not balanced" }, -{ REG_BADBR, "REG_BADBR", "invalid repetition count(s)" }, -{ REG_ERANGE, "REG_ERANGE", "invalid character range" }, -{ REG_ESPACE, "REG_ESPACE", "out of memory" }, -{ REG_BADRPT, "REG_BADRPT", "quantifier operand invalid" }, -{ REG_ASSERT, "REG_ASSERT", "\"can't happen\" -- you found a bug" }, -{ REG_INVARG, "REG_INVARG", "invalid argument to regex function" }, -{ REG_MIXED, "REG_MIXED", "character widths of regex and string differ" }, -{ REG_BADOPT, "REG_BADOPT", "invalid embedded option" }, +{ + REG_OKAY, "REG_OKAY", "no errors detected" +}, + +{ + REG_NOMATCH, "REG_NOMATCH", "failed to match" +}, + +{ + REG_BADPAT, "REG_BADPAT", "invalid regexp (reg version 0.8)" +}, + +{ + REG_ECOLLATE, "REG_ECOLLATE", "invalid collating element" +}, + +{ + REG_ECTYPE, "REG_ECTYPE", "invalid character class" +}, + +{ + REG_EESCAPE, "REG_EESCAPE", "invalid escape \\ sequence" +}, + +{ + REG_ESUBREG, "REG_ESUBREG", "invalid backreference number" +}, + +{ + REG_EBRACK, "REG_EBRACK", "brackets [] not balanced" +}, + +{ + REG_EPAREN, "REG_EPAREN", "parentheses () not balanced" +}, + +{ + REG_EBRACE, "REG_EBRACE", "braces {} not balanced" +}, + +{ + REG_BADBR, "REG_BADBR", "invalid repetition count(s)" +}, + +{ + REG_ERANGE, "REG_ERANGE", "invalid character range" +}, + +{ + REG_ESPACE, "REG_ESPACE", "out of memory" +}, + +{ + REG_BADRPT, "REG_BADRPT", "quantifier operand invalid" +}, + +{ + REG_ASSERT, "REG_ASSERT", "\"can't happen\" -- you found a bug" +}, + +{ + REG_INVARG, "REG_INVARG", "invalid argument to regex function" +}, + +{ + REG_MIXED, "REG_MIXED", "character widths of regex and string differ" +}, + +{ + REG_BADOPT, "REG_BADOPT", "invalid embedded option" +}, diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h index f29379126a5..86ea386dceb 100644 --- a/src/include/regex/regex.h +++ b/src/include/regex/regex.h @@ -1,15 +1,15 @@ #ifndef _REGEX_H_ -#define _REGEX_H_ /* never again */ +#define _REGEX_H_ /* never again */ /* * regular expressions * - * Copyright (c) 1998, 1999 Henry Spencer. All rights reserved. - * + * Copyright (c) 1998, 1999 Henry Spencer. All rights reserved. + * * Development of this software was funded, in part, by Cray Research Inc., * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics * Corporation, none of whom are responsible for the results. The author - * thanks all of them. - * + * thanks all of them. + * * Redistribution and use in source and binary forms -- with or without * modification -- are permitted for any purpose, provided that * redistributions in source form retain this entire copyright notice and @@ -17,7 +17,7 @@ * * I'd appreciate being given credit for this package in the documentation * of software which uses it, but that is not a requirement. - * + * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL @@ -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.23 2003/02/05 17:41:32 tgl Exp $ + * $Id: regex.h,v 1.24 2003/08/04 00:43:32 momjian Exp $ */ /* @@ -52,77 +52,81 @@ typedef long regoff_t; */ /* the biggie, a compiled RE (or rather, a front end to same) */ -typedef struct { - int re_magic; /* magic number */ - size_t re_nsub; /* number of subexpressions */ - long re_info; /* information about RE */ -# define REG_UBACKREF 000001 -# define REG_ULOOKAHEAD 000002 -# define REG_UBOUNDS 000004 -# define REG_UBRACES 000010 -# define REG_UBSALNUM 000020 -# define REG_UPBOTCH 000040 -# define REG_UBBS 000100 -# define REG_UNONPOSIX 000200 -# define REG_UUNSPEC 000400 -# define REG_UUNPORT 001000 -# define REG_ULOCALE 002000 -# define REG_UEMPTYMATCH 004000 -# define REG_UIMPOSSIBLE 010000 -# define REG_USHORTEST 020000 - int re_csize; /* sizeof(character) */ - char *re_endp; /* backward compatibility kludge */ +typedef struct +{ + int re_magic; /* magic number */ + size_t re_nsub; /* number of subexpressions */ + long re_info; /* information about RE */ +#define REG_UBACKREF 000001 +#define REG_ULOOKAHEAD 000002 +#define REG_UBOUNDS 000004 +#define REG_UBRACES 000010 +#define REG_UBSALNUM 000020 +#define REG_UPBOTCH 000040 +#define REG_UBBS 000100 +#define REG_UNONPOSIX 000200 +#define REG_UUNSPEC 000400 +#define REG_UUNPORT 001000 +#define REG_ULOCALE 002000 +#define REG_UEMPTYMATCH 004000 +#define REG_UIMPOSSIBLE 010000 +#define REG_USHORTEST 020000 + int re_csize; /* sizeof(character) */ + char *re_endp; /* backward compatibility kludge */ /* the rest is opaque pointers to hidden innards */ - char *re_guts; /* `char *' is more portable than `void *' */ - char *re_fns; + char *re_guts; /* `char *' is more portable than `void *' */ + char *re_fns; } regex_t; /* result reporting (may acquire more fields later) */ -typedef struct { - regoff_t rm_so; /* start of substring */ - regoff_t rm_eo; /* end of substring */ +typedef struct +{ + regoff_t rm_so; /* start of substring */ + regoff_t rm_eo; /* end of substring */ } regmatch_t; /* supplementary control and reporting */ -typedef struct { - regmatch_t rm_extend; /* see REG_EXPECT */ -} rm_detail_t; +typedef struct +{ + regmatch_t rm_extend; /* see REG_EXPECT */ +} rm_detail_t; /* * regex compilation flags */ -#define REG_BASIC 000000 /* BREs (convenience) */ -#define REG_EXTENDED 000001 /* EREs */ -#define REG_ADVF 000002 /* advanced features in EREs */ -#define REG_ADVANCED 000003 /* AREs (which are also EREs) */ -#define REG_QUOTE 000004 /* no special characters, none */ -#define REG_NOSPEC REG_QUOTE /* historical synonym */ -#define REG_ICASE 000010 /* ignore case */ -#define REG_NOSUB 000020 /* don't care about subexpressions */ -#define REG_EXPANDED 000040 /* expanded format, white space & comments */ -#define REG_NLSTOP 000100 /* \n doesn't match . or [^ ] */ -#define REG_NLANCH 000200 /* ^ matches after \n, $ before */ -#define REG_NEWLINE 000300 /* newlines are line terminators */ -#define REG_PEND 000400 /* ugh -- backward-compatibility hack */ -#define REG_EXPECT 001000 /* report details on partial/limited matches */ -#define REG_BOSONLY 002000 /* temporary kludge for BOS-only matches */ -#define REG_DUMP 004000 /* none of your business :-) */ -#define REG_FAKE 010000 /* none of your business :-) */ -#define REG_PROGRESS 020000 /* none of your business :-) */ +#define REG_BASIC 000000 /* BREs (convenience) */ +#define REG_EXTENDED 000001 /* EREs */ +#define REG_ADVF 000002 /* advanced features in EREs */ +#define REG_ADVANCED 000003 /* AREs (which are also EREs) */ +#define REG_QUOTE 000004 /* no special characters, none */ +#define REG_NOSPEC REG_QUOTE /* historical synonym */ +#define REG_ICASE 000010 /* ignore case */ +#define REG_NOSUB 000020 /* don't care about subexpressions */ +#define REG_EXPANDED 000040 /* expanded format, white space & comments */ +#define REG_NLSTOP 000100 /* \n doesn't match . or [^ ] */ +#define REG_NLANCH 000200 /* ^ matches after \n, $ before */ +#define REG_NEWLINE 000300 /* newlines are line terminators */ +#define REG_PEND 000400 /* ugh -- backward-compatibility hack */ +#define REG_EXPECT 001000 /* report details on partial/limited + * matches */ +#define REG_BOSONLY 002000 /* temporary kludge for BOS-only matches */ +#define REG_DUMP 004000 /* none of your business :-) */ +#define REG_FAKE 010000 /* none of your business :-) */ +#define REG_PROGRESS 020000 /* none of your business :-) */ /* * regex execution flags */ -#define REG_NOTBOL 0001 /* BOS is not BOL */ -#define REG_NOTEOL 0002 /* EOS is not EOL */ -#define REG_STARTEND 0004 /* backward compatibility kludge */ -#define REG_FTRACE 0010 /* none of your business */ -#define REG_MTRACE 0020 /* none of your business */ -#define REG_SMALL 0040 /* none of your business */ +#define REG_NOTBOL 0001 /* BOS is not BOL */ +#define REG_NOTEOL 0002 /* EOS is not EOL */ +#define REG_STARTEND 0004 /* backward compatibility kludge */ +#define REG_FTRACE 0010 /* none of your business */ +#define REG_MTRACE 0020 /* none of your business */ +#define REG_SMALL 0040 /* none of your business */ /* @@ -130,36 +134,37 @@ typedef struct { * Be careful if modifying the list of error codes -- the table used by * regerror() is generated automatically from this file! */ -#define REG_OKAY 0 /* no errors detected */ -#define REG_NOMATCH 1 /* failed to match */ -#define REG_BADPAT 2 /* invalid regexp */ -#define REG_ECOLLATE 3 /* invalid collating element */ -#define REG_ECTYPE 4 /* invalid character class */ -#define REG_EESCAPE 5 /* invalid escape \ sequence */ -#define REG_ESUBREG 6 /* invalid backreference number */ -#define REG_EBRACK 7 /* brackets [] not balanced */ -#define REG_EPAREN 8 /* parentheses () not balanced */ -#define REG_EBRACE 9 /* braces {} not balanced */ -#define REG_BADBR 10 /* invalid repetition count(s) */ -#define REG_ERANGE 11 /* invalid character range */ -#define REG_ESPACE 12 /* out of memory */ -#define REG_BADRPT 13 /* quantifier operand invalid */ -#define REG_ASSERT 15 /* "can't happen" -- you found a bug */ -#define REG_INVARG 16 /* invalid argument to regex function */ -#define REG_MIXED 17 /* character widths of regex and string differ */ -#define REG_BADOPT 18 /* invalid embedded option */ +#define REG_OKAY 0 /* no errors detected */ +#define REG_NOMATCH 1 /* failed to match */ +#define REG_BADPAT 2 /* invalid regexp */ +#define REG_ECOLLATE 3 /* invalid collating element */ +#define REG_ECTYPE 4 /* invalid character class */ +#define REG_EESCAPE 5 /* invalid escape \ sequence */ +#define REG_ESUBREG 6 /* invalid backreference number */ +#define REG_EBRACK 7 /* brackets [] not balanced */ +#define REG_EPAREN 8 /* parentheses () not balanced */ +#define REG_EBRACE 9 /* braces {} not balanced */ +#define REG_BADBR 10 /* invalid repetition count(s) */ +#define REG_ERANGE 11 /* invalid character range */ +#define REG_ESPACE 12 /* out of memory */ +#define REG_BADRPT 13 /* quantifier operand invalid */ +#define REG_ASSERT 15 /* "can't happen" -- you found a bug */ +#define REG_INVARG 16 /* invalid argument to regex function */ +#define REG_MIXED 17 /* character widths of regex and string + * differ */ +#define REG_BADOPT 18 /* invalid embedded option */ /* two specials for debugging and testing */ -#define REG_ATOI 101 /* convert error-code name to number */ -#define REG_ITOA 102 /* convert error-code number to name */ +#define REG_ATOI 101 /* convert error-code name to number */ +#define REG_ITOA 102 /* convert error-code number to name */ /* * the prototypes for exported functions */ -extern int pg_regcomp(regex_t *, const pg_wchar *, size_t, int); -extern int pg_regexec(regex_t *, const pg_wchar *, size_t, rm_detail_t *, size_t, regmatch_t [], int); +extern int pg_regcomp(regex_t *, const pg_wchar *, size_t, int); +extern int pg_regexec(regex_t *, const pg_wchar *, size_t, rm_detail_t *, size_t, regmatch_t[], int); extern void pg_regfree(regex_t *); extern size_t pg_regerror(int, const regex_t *, char *, size_t); -#endif /* _REGEX_H_ */ +#endif /* _REGEX_H_ */ diff --git a/src/include/regex/regguts.h b/src/include/regex/regguts.h index a08abb8af18..dfbd392d092 100644 --- a/src/include/regex/regguts.h +++ b/src/include/regex/regguts.h @@ -1,21 +1,21 @@ /* * Internal interface definitions, etc., for the reg package * - * Copyright (c) 1998, 1999 Henry Spencer. All rights reserved. - * + * Copyright (c) 1998, 1999 Henry Spencer. All rights reserved. + * * Development of this software was funded, in part, by Cray Research Inc., * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics * Corporation, none of whom are responsible for the results. The author - * thanks all of them. - * + * thanks all of them. + * * Redistribution and use in source and binary forms -- with or without * modification -- are permitted for any purpose, provided that * redistributions in source form retain this entire copyright notice and * indicate the origin and nature of any modifications. - * + * * I'd appreciate being given credit for this package in the documentation * of software which uses it, but that is not a requirement. - * + * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL @@ -27,7 +27,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: regguts.h,v 1.1 2003/02/05 17:41:32 tgl Exp $ + * $Id: regguts.h,v 1.2 2003/08/04 00:43:32 momjian Exp $ */ @@ -47,34 +47,34 @@ /* assertions */ #ifndef assert -# ifndef REG_DEBUG -# define NDEBUG /* no assertions */ -# endif +#ifndef REG_DEBUG +#define NDEBUG /* no assertions */ +#endif #include <assert.h> #endif /* voids */ #ifndef DISCARD -#define DISCARD void /* for throwing values away */ +#define DISCARD void /* for throwing values away */ #endif #ifndef VS -#define VS(x) ((void *)(x)) /* cast something to generic ptr */ +#define VS(x) ((void *)(x)) /* cast something to generic ptr */ #endif /* function-pointer declarator */ #ifndef FUNCPTR -#define FUNCPTR(name, args) (*name) args +#define FUNCPTR(name, args) (*name) args #endif /* memory allocation */ #ifndef MALLOC -#define MALLOC(n) malloc(n) +#define MALLOC(n) malloc(n) #endif #ifndef REALLOC -#define REALLOC(p, n) realloc(VS(p), n) +#define REALLOC(p, n) realloc(VS(p), n) #endif #ifndef FREE -#define FREE(p) free(VS(p)) +#define FREE(p) free(VS(p)) #endif /* want size of a char in bits, and max value in bounded quantifiers */ @@ -82,7 +82,7 @@ #include <limits.h> #endif #ifndef _POSIX2_RE_DUP_MAX -#define _POSIX2_RE_DUP_MAX 255 /* normally from <limits.h> */ +#define _POSIX2_RE_DUP_MAX 255 /* normally from <limits.h> */ #endif @@ -91,13 +91,13 @@ * misc */ -#define NOTREACHED 0 -#define xxx 1 +#define NOTREACHED 0 +#define xxx 1 -#define DUPMAX _POSIX2_RE_DUP_MAX -#define INFINITY (DUPMAX+1) +#define DUPMAX _POSIX2_RE_DUP_MAX +#define INFINITY (DUPMAX+1) -#define REMAGIC 0xfed7 /* magic number for main struct */ +#define REMAGIC 0xfed7 /* magic number for main struct */ @@ -106,12 +106,12 @@ */ #ifdef REG_DEBUG /* FDEBUG does finite-state tracing */ -#define FDEBUG(arglist) { if (v->eflags®_FTRACE) printf arglist; } +#define FDEBUG(arglist) { if (v->eflags®_FTRACE) printf arglist; } /* MDEBUG does higher-level tracing */ -#define MDEBUG(arglist) { if (v->eflags®_MTRACE) printf arglist; } +#define MDEBUG(arglist) { if (v->eflags®_MTRACE) printf arglist; } #else -#define FDEBUG(arglist) {} -#define MDEBUG(arglist) {} +#define FDEBUG(arglist) {} +#define MDEBUG(arglist) {} #endif @@ -119,24 +119,25 @@ /* * bitmap manipulation */ -#define UBITS (CHAR_BIT * sizeof(unsigned)) -#define BSET(uv, sn) ((uv)[(sn)/UBITS] |= (unsigned)1 << ((sn)%UBITS)) -#define ISBSET(uv, sn) ((uv)[(sn)/UBITS] & ((unsigned)1 << ((sn)%UBITS))) +#define UBITS (CHAR_BIT * sizeof(unsigned)) +#define BSET(uv, sn) ((uv)[(sn)/UBITS] |= (unsigned)1 << ((sn)%UBITS)) +#define ISBSET(uv, sn) ((uv)[(sn)/UBITS] & ((unsigned)1 << ((sn)%UBITS))) /* - * We dissect a chr into byts for colormap table indexing. Here we define - * a byt, which will be the same as a byte on most machines... The exact + * We dissect a chr into byts for colormap table indexing. Here we define + * a byt, which will be the same as a byte on most machines... The exact * size of a byt is not critical, but about 8 bits is good, and extraction * of 8-bit chunks is sometimes especially fast. */ #ifndef BYTBITS -#define BYTBITS 8 /* bits in a byt */ +#define BYTBITS 8 /* bits in a byt */ #endif -#define BYTTAB (1<<BYTBITS) /* size of table with one entry per byt value */ -#define BYTMASK (BYTTAB-1) /* bit mask for byt */ -#define NBYTS ((CHRBITS+BYTBITS-1)/BYTBITS) +#define BYTTAB (1<<BYTBITS) /* size of table with one entry per byt + * value */ +#define BYTMASK (BYTTAB-1) /* bit mask for byt */ +#define NBYTS ((CHRBITS+BYTBITS-1)/BYTBITS) /* the definition of GETCOLOR(), below, assumes NBYTS <= 4 */ @@ -145,79 +146,86 @@ * As soon as possible, we map chrs into equivalence classes -- "colors" -- * which are of much more manageable number. */ -typedef short color; /* colors of characters */ -typedef int pcolor; /* what color promotes to */ -#define COLORLESS (-1) /* impossible color */ -#define WHITE 0 /* default color, parent of all others */ +typedef short color; /* colors of characters */ +typedef int pcolor; /* what color promotes to */ + +#define COLORLESS (-1) /* impossible color */ +#define WHITE 0 /* default color, parent of all others */ /* * A colormap is a tree -- more precisely, a DAG -- indexed at each level - * by a byt of the chr, to map the chr to a color efficiently. Because + * by a byt of the chr, to map the chr to a color efficiently. Because * lower sections of the tree can be shared, it can exploit the usual - * sparseness of such a mapping table. The tree is always NBYTS levels + * sparseness of such a mapping table. The tree is always NBYTS levels * deep (in the past it was shallower during construction but was "filled" * to full depth at the end of that); areas that are unaltered as yet point * to "fill blocks" which are entirely WHITE in color. */ /* the tree itself */ -struct colors { - color ccolor[BYTTAB]; +struct colors +{ + color ccolor[BYTTAB]; }; -struct ptrs { +struct ptrs +{ union tree *pptr[BYTTAB]; }; -union tree { +union tree +{ struct colors colors; struct ptrs ptrs; }; -#define tcolor colors.ccolor -#define tptr ptrs.pptr + +#define tcolor colors.ccolor +#define tptr ptrs.pptr /* internal per-color structure for the color machinery */ -struct colordesc { - uchr nchrs; /* number of chars of this color */ - color sub; /* open subcolor (if any); free chain ptr */ -# define NOSUB COLORLESS - struct arc *arcs; /* color chain */ - int flags; -# define FREECOL 01 /* currently free */ -# define PSEUDO 02 /* pseudocolor, no real chars */ -# define UNUSEDCOLOR(cd) ((cd)->flags&FREECOL) - union tree *block; /* block of solid color, if any */ +struct colordesc +{ + uchr nchrs; /* number of chars of this color */ + color sub; /* open subcolor (if any); free chain ptr */ +#define NOSUB COLORLESS + struct arc *arcs; /* color chain */ + int flags; +#define FREECOL 01 /* currently free */ +#define PSEUDO 02 /* pseudocolor, no real chars */ +#define UNUSEDCOLOR(cd) ((cd)->flags&FREECOL) + union tree *block; /* block of solid color, if any */ }; /* the color map itself */ -struct colormap { - int magic; -# define CMMAGIC 0x876 - struct vars *v; /* for compile error reporting */ - size_t ncds; /* number of colordescs */ - size_t max; /* highest in use */ - color free; /* beginning of free chain (if non-0) */ +struct colormap +{ + int magic; +#define CMMAGIC 0x876 + struct vars *v; /* for compile error reporting */ + size_t ncds; /* number of colordescs */ + size_t max; /* highest in use */ + color free; /* beginning of free chain (if non-0) */ struct colordesc *cd; -# define CDEND(cm) (&(cm)->cd[(cm)->max + 1]) -# define NINLINECDS ((size_t)10) +#define CDEND(cm) (&(cm)->cd[(cm)->max + 1]) +#define NINLINECDS ((size_t)10) struct colordesc cdspace[NINLINECDS]; - union tree tree[NBYTS]; /* tree top, plus fill blocks */ + union tree tree[NBYTS]; /* tree top, plus fill blocks */ }; /* optimization magic to do fast chr->color mapping */ -#define B0(c) ((c) & BYTMASK) -#define B1(c) (((c)>>BYTBITS) & BYTMASK) -#define B2(c) (((c)>>(2*BYTBITS)) & BYTMASK) -#define B3(c) (((c)>>(3*BYTBITS)) & BYTMASK) +#define B0(c) ((c) & BYTMASK) +#define B1(c) (((c)>>BYTBITS) & BYTMASK) +#define B2(c) (((c)>>(2*BYTBITS)) & BYTMASK) +#define B3(c) (((c)>>(3*BYTBITS)) & BYTMASK) #if NBYTS == 1 -#define GETCOLOR(cm, c) ((cm)->tree->tcolor[B0(c)]) +#define GETCOLOR(cm, c) ((cm)->tree->tcolor[B0(c)]) #endif /* beware, for NBYTS>1, GETCOLOR() is unsafe -- 2nd arg used repeatedly */ #if NBYTS == 2 -#define GETCOLOR(cm, c) ((cm)->tree->tptr[B1(c)]->tcolor[B0(c)]) +#define GETCOLOR(cm, c) ((cm)->tree->tptr[B1(c)]->tcolor[B0(c)]) #endif #if NBYTS == 4 -#define GETCOLOR(cm, c) ((cm)->tree->tptr[B3(c)]->tptr[B2(c)]->tptr[B1(c)]->tcolor[B0(c)]) +#define GETCOLOR(cm, c) ((cm)->tree->tptr[B3(c)]->tptr[B2(c)]->tptr[B1(c)]->tcolor[B0(c)]) #endif @@ -226,22 +234,23 @@ struct colormap { * Interface definitions for locale-interface functions in locale.c. * Multi-character collating elements (MCCEs) cause most of the trouble. */ -struct cvec { - int nchrs; /* number of chrs */ - int chrspace; /* number of chrs possible */ - chr *chrs; /* pointer to vector of chrs */ - int nranges; /* number of ranges (chr pairs) */ - int rangespace; /* number of chrs possible */ - chr *ranges; /* pointer to vector of chr pairs */ - int nmcces; /* number of MCCEs */ - int mccespace; /* number of MCCEs possible */ - int nmccechrs; /* number of chrs used for MCCEs */ - chr *mcces[1]; /* pointers to 0-terminated MCCEs */ - /* and both batches of chrs are on the end */ +struct cvec +{ + int nchrs; /* number of chrs */ + int chrspace; /* number of chrs possible */ + chr *chrs; /* pointer to vector of chrs */ + int nranges; /* number of ranges (chr pairs) */ + int rangespace; /* number of chrs possible */ + chr *ranges; /* pointer to vector of chr pairs */ + int nmcces; /* number of MCCEs */ + int mccespace; /* number of MCCEs possible */ + int nmccechrs; /* number of chrs used for MCCEs */ + chr *mcces[1]; /* pointers to 0-terminated MCCEs */ + /* and both batches of chrs are on the end */ }; /* caution: this value cannot be changed easily */ -#define MAXMCCE 2 /* length of longest MCCE */ +#define MAXMCCE 2 /* length of longest MCCE */ @@ -253,54 +262,59 @@ struct cvec { */ struct state; -struct arc { - int type; -# define ARCFREE '\0' - color co; - struct state *from; /* where it's from (and contained within) */ - struct state *to; /* where it's to */ - struct arc *outchain; /* *from's outs chain or free chain */ -# define freechain outchain - struct arc *inchain; /* *to's ins chain */ - struct arc *colorchain; /* color's arc chain */ +struct arc +{ + int type; +#define ARCFREE '\0' + color co; + struct state *from; /* where it's from (and contained within) */ + struct state *to; /* where it's to */ + struct arc *outchain; /* *from's outs chain or free chain */ +#define freechain outchain + struct arc *inchain; /* *to's ins chain */ + struct arc *colorchain; /* color's arc chain */ }; -struct arcbatch { /* for bulk allocation of arcs */ +struct arcbatch +{ /* for bulk allocation of arcs */ struct arcbatch *next; -# define ABSIZE 10 - struct arc a[ABSIZE]; +#define ABSIZE 10 + struct arc a[ABSIZE]; }; -struct state { - int no; -# define FREESTATE (-1) - char flag; /* marks special states */ - int nins; /* number of inarcs */ - struct arc *ins; /* chain of inarcs */ - int nouts; /* number of outarcs */ - struct arc *outs; /* chain of outarcs */ - struct arc *free; /* chain of free arcs */ - struct state *tmp; /* temporary for traversal algorithms */ - struct state *next; /* chain for traversing all */ - struct state *prev; /* back chain */ - struct arcbatch oas; /* first arcbatch, avoid malloc in easy case */ - int noas; /* number of arcs used in first arcbatch */ +struct state +{ + int no; +#define FREESTATE (-1) + char flag; /* marks special states */ + int nins; /* number of inarcs */ + struct arc *ins; /* chain of inarcs */ + int nouts; /* number of outarcs */ + struct arc *outs; /* chain of outarcs */ + struct arc *free; /* chain of free arcs */ + struct state *tmp; /* temporary for traversal algorithms */ + struct state *next; /* chain for traversing all */ + struct state *prev; /* back chain */ + struct arcbatch oas; /* first arcbatch, avoid malloc in easy + * case */ + int noas; /* number of arcs used in first arcbatch */ }; -struct nfa { - struct state *pre; /* pre-initial state */ - struct state *init; /* initial state */ - struct state *final; /* final state */ - struct state *post; /* post-final state */ - int nstates; /* for numbering states */ - struct state *states; /* state-chain header */ - struct state *slast; /* tail of the chain */ - struct state *free; /* free list */ - struct colormap *cm; /* the color map */ - color bos[2]; /* colors, if any, assigned to BOS and BOL */ - color eos[2]; /* colors, if any, assigned to EOS and EOL */ - struct vars *v; /* simplifies compile error reporting */ - struct nfa *parent; /* parent NFA, if any */ +struct nfa +{ + struct state *pre; /* pre-initial state */ + struct state *init; /* initial state */ + struct state *final; /* final state */ + struct state *post; /* post-final state */ + int nstates; /* for numbering states */ + struct state *states; /* state-chain header */ + struct state *slast; /* tail of the chain */ + struct state *free; /* free list */ + struct colormap *cm; /* the color map */ + color bos[2]; /* colors, if any, assigned to BOS and BOL */ + color eos[2]; /* colors, if any, assigned to EOS and EOL */ + struct vars *v; /* simplifies compile error reporting */ + struct nfa *parent; /* parent NFA, if any */ }; @@ -308,58 +322,64 @@ struct nfa { /* * definitions for compacted NFA */ -struct carc { - color co; /* COLORLESS is list terminator */ - int to; /* state number */ +struct carc +{ + color co; /* COLORLESS is list terminator */ + int to; /* state number */ }; -struct cnfa { - int nstates; /* number of states */ - int ncolors; /* number of colors */ - int flags; -# define HASLACONS 01 /* uses lookahead constraints */ - int pre; /* setup state number */ - int post; /* teardown state number */ - color bos[2]; /* colors, if any, assigned to BOS and BOL */ - color eos[2]; /* colors, if any, assigned to EOS and EOL */ - struct carc **states; /* vector of pointers to outarc lists */ - struct carc *arcs; /* the area for the lists */ +struct cnfa +{ + int nstates; /* number of states */ + int ncolors; /* number of colors */ + int flags; +#define HASLACONS 01 /* uses lookahead constraints */ + int pre; /* setup state number */ + int post; /* teardown state number */ + color bos[2]; /* colors, if any, assigned to BOS and BOL */ + color eos[2]; /* colors, if any, assigned to EOS and EOL */ + struct carc **states; /* vector of pointers to outarc lists */ + struct carc *arcs; /* the area for the lists */ }; -#define ZAPCNFA(cnfa) ((cnfa).nstates = 0) -#define NULLCNFA(cnfa) ((cnfa).nstates == 0) + +#define ZAPCNFA(cnfa) ((cnfa).nstates = 0) +#define NULLCNFA(cnfa) ((cnfa).nstates == 0) /* * subexpression tree */ -struct subre { - char op; /* '|', '.' (concat), 'b' (backref), '(', '=' */ - char flags; -# define LONGER 01 /* prefers longer match */ -# define SHORTER 02 /* prefers shorter match */ -# define MIXED 04 /* mixed preference below */ -# define CAP 010 /* capturing parens below */ -# define BACKR 020 /* back reference below */ -# define INUSE 0100 /* in use in final tree */ -# define LOCAL 03 /* bits which may not propagate up */ -# define LMIX(f) ((f)<<2) /* LONGER -> MIXED */ -# define SMIX(f) ((f)<<1) /* SHORTER -> MIXED */ -# define UP(f) (((f)&~LOCAL) | (LMIX(f) & SMIX(f) & MIXED)) -# define MESSY(f) ((f)&(MIXED|CAP|BACKR)) -# define PREF(f) ((f)&LOCAL) -# define PREF2(f1, f2) ((PREF(f1) != 0) ? PREF(f1) : PREF(f2)) -# define COMBINE(f1, f2) (UP((f1)|(f2)) | PREF2(f1, f2)) - short retry; /* index into retry memory */ - int subno; /* subexpression number (for 'b' and '(') */ - short min; /* min repetitions, for backref only */ - short max; /* max repetitions, for backref only */ - struct subre *left; /* left child, if any (also freelist chain) */ - struct subre *right; /* right child, if any */ - struct state *begin; /* outarcs from here... */ - struct state *end; /* ...ending in inarcs here */ - struct cnfa cnfa; /* compacted NFA, if any */ - struct subre *chain; /* for bookkeeping and error cleanup */ +struct subre +{ + char op; /* '|', '.' (concat), 'b' (backref), '(', + * '=' */ + char flags; +#define LONGER 01 /* prefers longer match */ +#define SHORTER 02 /* prefers shorter match */ +#define MIXED 04 /* mixed preference below */ +#define CAP 010 /* capturing parens below */ +#define BACKR 020 /* back reference below */ +#define INUSE 0100 /* in use in final tree */ +#define LOCAL 03 /* bits which may not propagate up */ +#define LMIX(f) ((f)<<2) /* LONGER -> MIXED */ +#define SMIX(f) ((f)<<1) /* SHORTER -> MIXED */ +#define UP(f) (((f)&~LOCAL) | (LMIX(f) & SMIX(f) & MIXED)) +#define MESSY(f) ((f)&(MIXED|CAP|BACKR)) +#define PREF(f) ((f)&LOCAL) +#define PREF2(f1, f2) ((PREF(f1) != 0) ? PREF(f1) : PREF(f2)) +#define COMBINE(f1, f2) (UP((f1)|(f2)) | PREF2(f1, f2)) + short retry; /* index into retry memory */ + int subno; /* subexpression number (for 'b' and '(') */ + short min; /* min repetitions, for backref only */ + short max; /* max repetitions, for backref only */ + struct subre *left; /* left child, if any (also freelist + * chain) */ + struct subre *right; /* right child, if any */ + struct state *begin; /* outarcs from here... */ + struct state *end; /* ...ending in inarcs here */ + struct cnfa cnfa; /* compacted NFA, if any */ + struct subre *chain; /* for bookkeeping and error cleanup */ }; @@ -368,8 +388,9 @@ struct subre { * table of function pointers for generic manipulation functions * A regex_t's re_fns points to one of these. */ -struct fns { - void FUNCPTR(free, (regex_t *)); +struct fns +{ + void FUNCPTR(free, (regex_t *)); }; @@ -377,17 +398,18 @@ struct fns { /* * the insides of a regex_t, hidden behind a void * */ -struct guts { - int magic; -# define GUTSMAGIC 0xfed9 - int cflags; /* copy of compile flags */ - long info; /* copy of re_info */ - size_t nsub; /* copy of re_nsub */ +struct guts +{ + int magic; +#define GUTSMAGIC 0xfed9 + int cflags; /* copy of compile flags */ + long info; /* copy of re_info */ + size_t nsub; /* copy of re_nsub */ struct subre *tree; - struct cnfa search; /* for fast preliminary search */ - int ntree; + struct cnfa search; /* for fast preliminary search */ + int ntree; struct colormap cmap; - int FUNCPTR(compare, (const chr *, const chr *, size_t)); - struct subre *lacons; /* lookahead-constraint vector */ - int nlacons; /* size of lacons */ + int FUNCPTR(compare, (const chr *, const chr *, size_t)); + struct subre *lacons; /* lookahead-constraint vector */ + int nlacons; /* size of lacons */ }; diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 767530fc189..f8bed9de033 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: bufmgr.h,v 1.67 2003/03/28 20:17:13 tgl Exp $ + * $Id: bufmgr.h,v 1.68 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,7 +23,7 @@ typedef void *Block; /* in globals.c ... this duplicates miscadmin.h */ -extern DLLIMPORT int NBuffers; +extern DLLIMPORT int NBuffers; /* in bufmgr.c */ extern bool zero_damaged_pages; @@ -33,7 +33,7 @@ extern DLLIMPORT Block *BufferBlockPointers; extern long *PrivateRefCount; /* in localbuf.c */ -extern DLLIMPORT int NLocBuffer; +extern DLLIMPORT int NLocBuffer; extern DLLIMPORT Block *LocalBufferBlockPointers; extern long *LocalRefCount; diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h index 8e93a69d77f..b60d0ceb2f4 100644 --- a/src/include/storage/freespace.h +++ b/src/include/storage/freespace.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: freespace.h,v 1.10 2003/03/06 00:04:27 tgl Exp $ + * $Id: freespace.h,v 1.11 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,9 +23,9 @@ */ typedef struct PageFreeSpaceInfo { - BlockNumber blkno; /* which page in relation */ - Size avail; /* space available on this page */ -} PageFreeSpaceInfo; + BlockNumber blkno; /* which page in relation */ + Size avail; /* space available on this page */ +} PageFreeSpaceInfo; /* GUC variables */ @@ -46,13 +46,13 @@ extern BlockNumber RecordAndGetPageWithFreeSpace(RelFileNode *rel, Size spaceNeeded); extern Size GetAvgFSMRequestSize(RelFileNode *rel); extern void RecordRelationFreeSpace(RelFileNode *rel, - int nPages, - PageFreeSpaceInfo *pageSpaces); + int nPages, + PageFreeSpaceInfo * pageSpaces); extern BlockNumber GetFreeIndexPage(RelFileNode *rel); extern void RecordIndexFreeSpace(RelFileNode *rel, - int nPages, - BlockNumber *pages); + int nPages, + BlockNumber *pages); extern void FreeSpaceMapTruncateRel(RelFileNode *rel, BlockNumber nblocks); extern void FreeSpaceMapForgetRel(RelFileNode *rel); diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 60482c67b99..577559f7a95 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lock.h,v 1.71 2003/02/19 23:41:15 momjian Exp $ + * $Id: lock.h,v 1.72 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -160,7 +160,7 @@ typedef struct LOCK * information for each such holder (or would-be holder). * * PROCLOCKTAG is the key information needed to look up a PROCLOCK item in the - * proclock hashtable. A PROCLOCKTAG value uniquely identifies a lock + * proclock hashtable. A PROCLOCKTAG value uniquely identifies a lock * holder/waiter. * * There are two possible kinds of proclock tags: a transaction (identified @@ -199,7 +199,8 @@ typedef struct PROCLOCK int holding[MAX_LOCKMODES]; /* count of locks currently held */ int nHolding; /* total of holding[] array */ SHM_QUEUE lockLink; /* list link for lock's list of proclocks */ - SHM_QUEUE procLink; /* list link for process's list of proclocks */ + SHM_QUEUE procLink; /* list link for process's list of + * proclocks */ } PROCLOCK; #define PROCLOCK_LOCKMETHOD(proclock) \ @@ -246,9 +247,9 @@ extern int LockShmemSize(int maxBackends); extern bool DeadLockCheck(PGPROC *proc); extern void DeadLockReport(void); extern void RememberSimpleDeadLock(PGPROC *proc1, - LOCKMODE lockmode, - LOCK *lock, - PGPROC *proc2); + LOCKMODE lockmode, + LOCK *lock, + PGPROC *proc2); extern void InitDeadLockChecking(void); extern LockData *GetLockStatusData(void); extern const char *GetLockmodeName(LOCKMODE mode); diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h index b5721f4593f..66d45e33bc4 100644 --- a/src/include/tcop/dest.h +++ b/src/include/tcop/dest.h @@ -29,7 +29,7 @@ * * CreateDestReceiver returns a receiver object appropriate to the specified * destination. The executor, as well as utility statements that can return - * tuples, are passed the resulting DestReceiver* pointer. Each executor run + * tuples, are passed the resulting DestReceiver* pointer. Each executor run * or utility execution calls the receiver's startup method, then the * receiveTuple method (zero or more times), then the shutdown method. * The same receiver object may be re-used multiple times; eventually it is @@ -41,8 +41,8 @@ * object that has DestReceiver as its first field and contains additional * fields (see printtup.c for an example). These additional fields are then * accessible to the DestReceiver functions by casting the DestReceiver* - * pointer passed to them. The palloc'd object is pfree'd by the destroy - * method. Note that the caller of CreateDestReceiver should take care to + * pointer passed to them. The palloc'd object is pfree'd by the destroy + * method. Note that the caller of CreateDestReceiver should take care to * do so in a memory context that is long-lived enough for the receiver * object not to disappear while still needed. * @@ -54,7 +54,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dest.h,v 1.38 2003/05/08 18:16:37 tgl Exp $ + * $Id: dest.h,v 1.39 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -73,7 +73,7 @@ * destination. Someday this will probably need to be improved. * * Note: only the values None, Debug, Remote are legal for the global - * variable whereToSendOutput. The other values may be used + * variable whereToSendOutput. The other values may be used * as the destination for individual commands. * ---------------- */ @@ -104,21 +104,21 @@ struct _DestReceiver { /* Called for each tuple to be output: */ void (*receiveTuple) (HeapTuple tuple, - TupleDesc typeinfo, - DestReceiver *self); + TupleDesc typeinfo, + DestReceiver *self); /* Per-executor-run initialization and shutdown: */ void (*startup) (DestReceiver *self, - int operation, - TupleDesc typeinfo); + int operation, + TupleDesc typeinfo); void (*shutdown) (DestReceiver *self); /* Destroy the receiver object itself (if dynamically allocated) */ void (*destroy) (DestReceiver *self); /* CommandDest code for this receiver */ - CommandDest mydest; + CommandDest mydest; /* Private fields might appear beyond this point... */ }; -extern DestReceiver *None_Receiver; /* permanent receiver for None */ +extern DestReceiver *None_Receiver; /* permanent receiver for None */ /* This is a forward reference to utils/portal.h */ diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h index ff9cc9d76ac..9a20259ae01 100644 --- a/src/include/tcop/pquery.h +++ b/src/include/tcop/pquery.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pquery.h,v 1.27 2003/05/08 18:16:37 tgl Exp $ + * $Id: pquery.h,v 1.28 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,25 +18,25 @@ extern void ProcessQuery(Query *parsetree, - Plan *plan, - ParamListInfo params, - DestReceiver *dest, - char *completionTag); + Plan *plan, + ParamListInfo params, + DestReceiver *dest, + char *completionTag); extern PortalStrategy ChoosePortalStrategy(List *parseTrees); extern void PortalStart(Portal portal, ParamListInfo params); extern void PortalSetResultFormat(Portal portal, int nFormats, - int16 *formats); + int16 *formats); extern bool PortalRun(Portal portal, long count, - DestReceiver *dest, DestReceiver *altdest, - char *completionTag); + DestReceiver *dest, DestReceiver *altdest, + char *completionTag); extern long PortalRunFetch(Portal portal, - FetchDirection fdirection, - long count, - DestReceiver *dest); + FetchDirection fdirection, + long count, + DestReceiver *dest); #endif /* PQUERY_H */ diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index ee2e4391fb5..10034392914 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tcopprot.h,v 1.58 2003/07/22 20:29:13 momjian Exp $ + * $Id: tcopprot.h,v 1.59 2003/08/04 00:43:32 momjian Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -40,11 +40,10 @@ extern List *pg_parse_and_rewrite(const char *query_string, Oid *paramTypes, int numParams); extern List *pg_parse_query(const char *query_string); extern List *pg_analyze_and_rewrite(Node *parsetree, - Oid *paramTypes, int numParams); + Oid *paramTypes, int numParams); extern List *pg_rewrite_queries(List *querytree_list); extern Plan *pg_plan_query(Query *querytree); extern List *pg_plan_queries(List *querytrees, bool needSnapshot); - #endif /* BOOTSTRAP_INCLUDE */ extern void die(SIGNAL_ARGS); diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index 3849cf2e857..8226381fbaf 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: acl.h,v 1.58 2003/08/01 00:15:25 tgl Exp $ + * $Id: acl.h,v 1.59 2003/08/04 00:43:32 momjian Exp $ * * NOTES * For backward-compatibility purposes we have to allow there @@ -61,7 +61,7 @@ typedef struct AclItem * and the lower 15 bits are the actual privileges. */ #define ACLITEM_GET_PRIVS(item) ((item).ai_privs & 0x7FFF) -#define ACLITEM_GET_GOPTIONS(item) (((item).ai_privs >> 15) & 0x7FFF) +#define ACLITEM_GET_GOPTIONS(item) (((item).ai_privs >> 15) & 0x7FFF) #define ACLITEM_GET_IDTYPE(item) ((item).ai_privs >> 30) #define ACL_GRANT_OPTION_FOR(privs) (((privs) & 0x7FFF) << 15) @@ -190,14 +190,14 @@ typedef enum AclObjectKind ACL_KIND_OPCLASS, /* pg_opclass */ ACL_KIND_CONVERSION, /* pg_conversion */ MAX_ACL_KIND /* MUST BE LAST */ -} AclObjectKind; +} AclObjectKind; /* * routines used internally */ extern Acl *acldefault(GrantObjectType objtype, AclId ownerid); extern Acl *aclinsert3(const Acl *old_acl, const AclItem *mod_aip, - unsigned modechg, DropBehavior behavior); + unsigned modechg, DropBehavior behavior); /* * SQL functions (from acl.c) @@ -224,7 +224,7 @@ extern AclResult pg_language_aclcheck(Oid lang_oid, AclId userid, AclMode mode); extern AclResult pg_namespace_aclcheck(Oid nsp_oid, AclId userid, AclMode mode); extern void aclcheck_error(AclResult aclerr, AclObjectKind objectkind, - const char *objectname); + const char *objectname); /* ownercheck routines just return true (owner) or false (not) */ extern bool pg_class_ownercheck(Oid class_oid, AclId userid); diff --git a/src/include/utils/array.h b/src/include/utils/array.h index 50c222a9b4d..048210087a8 100644 --- a/src/include/utils/array.h +++ b/src/include/utils/array.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: array.h,v 1.42 2003/07/14 20:34:18 tgl Exp $ + * $Id: array.h,v 1.43 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,6 +36,7 @@ typedef struct ArrayBuildState { MemoryContext mcontext; /* where all the temp stuff is kept */ Datum *dvalues; /* array of accumulated Datums */ + /* * The allocated size of dvalues[] is always a multiple of * ARRAY_ELEMS_CHUNKSIZE @@ -46,22 +47,22 @@ typedef struct ArrayBuildState int16 typlen; /* needed info about datatype */ bool typbyval; char typalign; -} ArrayBuildState; +} ArrayBuildState; /* * structure to cache type metadata needed for array manipulation */ typedef struct ArrayMetaState { - Oid element_type; - int16 typlen; - bool typbyval; - char typalign; - char typdelim; - Oid typelem; - Oid typiofunc; - FmgrInfo proc; -} ArrayMetaState; + Oid element_type; + int16 typlen; + bool typbyval; + char typalign; + char typdelim; + Oid typelem; + Oid typiofunc; + FmgrInfo proc; +} ArrayMetaState; /* * fmgr macros for array objects @@ -151,22 +152,22 @@ extern ArrayType *construct_array(Datum *elems, int nelems, Oid elmtype, int elmlen, bool elmbyval, char elmalign); extern ArrayType *construct_md_array(Datum *elems, - int ndims, - int *dims, - int *lbs, - Oid elmtype, int elmlen, bool elmbyval, char elmalign); + int ndims, + int *dims, + int *lbs, + Oid elmtype, int elmlen, bool elmbyval, char elmalign); extern void deconstruct_array(ArrayType *array, Oid elmtype, int elmlen, bool elmbyval, char elmalign, Datum **elemsp, int *nelemsp); -extern ArrayBuildState *accumArrayResult(ArrayBuildState *astate, - Datum dvalue, bool disnull, - Oid element_type, - MemoryContext rcontext); -extern Datum makeArrayResult(ArrayBuildState *astate, - MemoryContext rcontext); -extern Datum makeMdArrayResult(ArrayBuildState *astate, int ndims, - int *dims, int *lbs, MemoryContext rcontext); +extern ArrayBuildState *accumArrayResult(ArrayBuildState * astate, + Datum dvalue, bool disnull, + Oid element_type, + MemoryContext rcontext); +extern Datum makeArrayResult(ArrayBuildState * astate, + MemoryContext rcontext); +extern Datum makeMdArrayResult(ArrayBuildState * astate, int ndims, + int *dims, int *lbs, MemoryContext rcontext); /* * prototypes for functions defined in arrayutils.c @@ -187,8 +188,8 @@ extern Datum array_push(PG_FUNCTION_ARGS); extern Datum array_cat(PG_FUNCTION_ARGS); extern ArrayType *create_singleton_array(FunctionCallInfo fcinfo, - Oid element_type, - Datum element, - int ndims); + Oid element_type, + Datum element, + int ndims); #endif /* ARRAY_H */ diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index f2164590a36..b5e755882a0 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.224 2003/07/30 22:56:24 tgl Exp $ + * $Id: builtins.h,v 1.225 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -408,7 +408,7 @@ extern Datum texticregexne(PG_FUNCTION_ARGS); extern Datum textregexsubstr(PG_FUNCTION_ARGS); extern Datum similar_escape(PG_FUNCTION_ARGS); extern const char *assign_regex_flavor(const char *value, - bool doit, bool interactive); + bool doit, bool interactive); /* regproc.c */ extern Datum regprocin(PG_FUNCTION_ARGS); diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h index 6fe4723bbee..109a86b0a91 100644 --- a/src/include/utils/datetime.h +++ b/src/include/utils/datetime.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: datetime.h,v 1.41 2003/07/17 22:28:42 tgl Exp $ + * $Id: datetime.h,v 1.42 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -268,8 +268,8 @@ extern int day_tab[2][13]; || (((m) == UTIME_MAXMONTH) && ((d) <= UTIME_MAXDAY)))))) /* Julian-date equivalents of Day 0 in Unix and Postgres reckoning */ -#define UNIX_EPOCH_JDATE 2440588 /* == date2j(1970, 1, 1) */ -#define POSTGRES_EPOCH_JDATE 2451545 /* == date2j(2000, 1, 1) */ +#define UNIX_EPOCH_JDATE 2440588 /* == date2j(1970, 1, 1) */ +#define POSTGRES_EPOCH_JDATE 2451545 /* == date2j(2000, 1, 1) */ extern void GetCurrentDateTime(struct tm * tm); diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 5c5a66a7617..faa4783d4eb 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: elog.h,v 1.60 2003/07/27 18:37:52 tgl Exp $ + * $Id: elog.h,v 1.61 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,12 +45,12 @@ #define FATAL 21 /* fatal error - abort process */ #define PANIC 22 /* take down the other backends with me */ - /*#define DEBUG DEBUG1*/ /* Backward compatibility with pre-7.3 */ + /* #define DEBUG DEBUG1 */ /* Backward compatibility with pre-7.3 */ /* macros for representing SQLSTATE strings compactly */ #define PGSIXBIT(ch) (((ch) - '0') & 0x3F) -#define PGUNSIXBIT(val) (((val) & 0x3F) + '0') +#define PGUNSIXBIT(val) (((val) & 0x3F) + '0') #define MAKE_SQLSTATE(ch1,ch2,ch3,ch4,ch5) \ (PGSIXBIT(ch1) + (PGSIXBIT(ch2) << 6) + (PGSIXBIT(ch3) << 12) + \ @@ -80,7 +80,7 @@ * ... other errxxx() fields as needed ...)); * * The error level is required, and so is a primary error message (errmsg - * or errmsg_internal). All else is optional. errcode() defaults to + * or errmsg_internal). All else is optional. errcode() defaults to * ERRCODE_INTERNAL_ERROR if elevel is ERROR or more, ERRCODE_WARNING * if elevel is WARNING, or ERRCODE_SUCCESSFUL_COMPLETION if elevel is * NOTICE or below. @@ -91,41 +91,46 @@ (errfinish rest) : (void) 0) extern bool errstart(int elevel, const char *filename, int lineno, - const char *funcname); -extern void errfinish(int dummy, ...); + const char *funcname); +extern void errfinish(int dummy,...); -extern int errcode(int sqlerrcode); +extern int errcode(int sqlerrcode); -extern int errcode_for_file_access(void); -extern int errcode_for_socket_access(void); +extern int errcode_for_file_access(void); +extern int errcode_for_socket_access(void); -extern int errmsg(const char *fmt, ...) +extern int +errmsg(const char *fmt,...) /* This extension allows gcc to check the format string for consistency with the supplied arguments. */ __attribute__((format(printf, 1, 2))); -extern int errmsg_internal(const char *fmt, ...) +extern int +errmsg_internal(const char *fmt,...) /* This extension allows gcc to check the format string for consistency with the supplied arguments. */ __attribute__((format(printf, 1, 2))); -extern int errdetail(const char *fmt, ...) +extern int +errdetail(const char *fmt,...) /* This extension allows gcc to check the format string for consistency with the supplied arguments. */ __attribute__((format(printf, 1, 2))); -extern int errhint(const char *fmt, ...) +extern int +errhint(const char *fmt,...) /* This extension allows gcc to check the format string for consistency with the supplied arguments. */ __attribute__((format(printf, 1, 2))); -extern int errcontext(const char *fmt, ...) +extern int +errcontext(const char *fmt,...) /* This extension allows gcc to check the format string for consistency with the supplied arguments. */ __attribute__((format(printf, 1, 2))); -extern int errfunction(const char *funcname); -extern int errposition(int cursorpos); +extern int errfunction(const char *funcname); +extern int errposition(int cursorpos); /*---------- @@ -133,10 +138,10 @@ extern int errposition(int cursorpos); * elog(ERROR, "portal \"%s\" not found", stmt->portalname); *---------- */ -#define elog errstart(ERROR, __FILE__, __LINE__, PG_FUNCNAME_MACRO), elog_finish +#define elog errstart(ERROR, __FILE__, __LINE__, PG_FUNCNAME_MACRO), elog_finish extern void -elog_finish(int elevel, const char *fmt, ...) +elog_finish(int elevel, const char *fmt,...) /* This extension allows gcc to check the format string for consistency with the supplied arguments. */ __attribute__((format(printf, 2, 3))); @@ -147,9 +152,9 @@ __attribute__((format(printf, 2, 3))); typedef struct ErrorContextCallback { struct ErrorContextCallback *previous; - void (*callback) (void *arg); - void *arg; -} ErrorContextCallback; + void (*callback) (void *arg); + void *arg; +} ErrorContextCallback; extern DLLIMPORT ErrorContextCallback *error_context_stack; @@ -161,11 +166,12 @@ 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; extern bool Log_pid; + #ifdef HAVE_SYSLOG extern int Use_syslog; #endif diff --git a/src/include/utils/errcodes.h b/src/include/utils/errcodes.h index f076c7327bc..8db8e52320c 100644 --- a/src/include/utils/errcodes.h +++ b/src/include/utils/errcodes.h @@ -5,13 +5,13 @@ * * The error code list is kept in its own source file for possible use by * automatic tools. Each error code is identified by a five-character string - * following the SQLSTATE conventions. The exact representation of the + * following the SQLSTATE conventions. The exact representation of the * string is determined by the MAKE_SQLSTATE() macro, which is not defined * in this file; it can be defined by the caller for special purposes. * * Copyright (c) 2003, PostgreSQL Global Development Group * - * $Id: errcodes.h,v 1.3 2003/07/31 21:34:18 tgl Exp $ + * $Id: errcodes.h,v 1.4 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -91,9 +91,9 @@ #define ERRCODE_ARRAY_ELEMENT_ERROR MAKE_SQLSTATE('2','2', '0','2','E') /* SQL99's actual definition of "array element error" is subscript error */ #define ERRCODE_ARRAY_SUBSCRIPT_ERROR ERRCODE_ARRAY_ELEMENT_ERROR -#define ERRCODE_CHARACTER_NOT_IN_REPERTOIRE MAKE_SQLSTATE('2','2', '0','2','1') +#define ERRCODE_CHARACTER_NOT_IN_REPERTOIRE MAKE_SQLSTATE('2','2', '0','2','1') #define ERRCODE_DATETIME_FIELD_OVERFLOW MAKE_SQLSTATE('2','2', '0','0','8') -#define ERRCODE_DATETIME_VALUE_OUT_OF_RANGE ERRCODE_DATETIME_FIELD_OVERFLOW +#define ERRCODE_DATETIME_VALUE_OUT_OF_RANGE ERRCODE_DATETIME_FIELD_OVERFLOW #define ERRCODE_DIVISION_BY_ZERO MAKE_SQLSTATE('2','2', '0','1','2') #define ERRCODE_ERROR_IN_ASSIGNMENT MAKE_SQLSTATE('2','2', '0','0','5') #define ERRCODE_ESCAPE_CHARACTER_CONFLICT MAKE_SQLSTATE('2','2', '0','0','B') @@ -110,18 +110,18 @@ #define ERRCODE_INVALID_REGULAR_EXPRESSION MAKE_SQLSTATE('2','2', '0','1','B') #define ERRCODE_INVALID_TIME_ZONE_DISPLACEMENT_VALUE MAKE_SQLSTATE('2','2', '0','0','9') #define ERRCODE_INVALID_USE_OF_ESCAPE_CHARACTER MAKE_SQLSTATE('2','2', '0','0','C') -#define ERRCODE_MOST_SPECIFIC_TYPE_MISMATCH MAKE_SQLSTATE('2','2', '0','0','G') +#define ERRCODE_MOST_SPECIFIC_TYPE_MISMATCH MAKE_SQLSTATE('2','2', '0','0','G') #define ERRCODE_NULL_VALUE_NOT_ALLOWED MAKE_SQLSTATE('2','2', '0','0','4') #define ERRCODE_NULL_VALUE_NO_INDICATOR_PARAMETER MAKE_SQLSTATE('2','2', '0','0','2') #define ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE MAKE_SQLSTATE('2','2', '0','0','3') -#define ERRCODE_STRING_DATA_LENGTH_MISMATCH MAKE_SQLSTATE('2','2', '0','2','6') +#define ERRCODE_STRING_DATA_LENGTH_MISMATCH MAKE_SQLSTATE('2','2', '0','2','6') #define ERRCODE_STRING_DATA_RIGHT_TRUNCATION MAKE_SQLSTATE('2','2', '0','0','1') #define ERRCODE_SUBSTRING_ERROR MAKE_SQLSTATE('2','2', '0','1','1') #define ERRCODE_TRIM_ERROR MAKE_SQLSTATE('2','2', '0','2','7') #define ERRCODE_UNTERMINATED_C_STRING MAKE_SQLSTATE('2','2', '0','2','4') #define ERRCODE_ZERO_LENGTH_CHARACTER_STRING MAKE_SQLSTATE('2','2', '0','0','F') #define ERRCODE_FLOATING_POINT_EXCEPTION MAKE_SQLSTATE('2','2', 'P','0','1') -#define ERRCODE_INVALID_TEXT_REPRESENTATION MAKE_SQLSTATE('2','2', 'P','0','2') +#define ERRCODE_INVALID_TEXT_REPRESENTATION MAKE_SQLSTATE('2','2', 'P','0','2') #define ERRCODE_INVALID_BINARY_REPRESENTATION MAKE_SQLSTATE('2','2', 'P','0','3') #define ERRCODE_BAD_COPY_FILE_FORMAT MAKE_SQLSTATE('2','2', 'P','0','4') #define ERRCODE_UNTRANSLATABLE_CHARACTER MAKE_SQLSTATE('2','2', 'P','0','5') @@ -158,7 +158,7 @@ #define ERRCODE_TRIGGERED_DATA_CHANGE_VIOLATION MAKE_SQLSTATE('2','7', '0','0','0') /* Class 28 - Invalid Authorization Specification */ -#define ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION MAKE_SQLSTATE('2','8', '0','0','0') +#define ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION MAKE_SQLSTATE('2','8', '0','0','0') /* Class 2B - Dependent Privilege Descriptors Still Exist */ #define ERRCODE_DEPENDENT_PRIVILEGE_DESCRIPTORS_STILL_EXIST MAKE_SQLSTATE('2','B', '0','0','0') @@ -169,7 +169,7 @@ /* Class 2F - SQL Routine Exception */ #define ERRCODE_SQL_ROUTINE_EXCEPTION MAKE_SQLSTATE('2','F', '0','0','0') -#define ERRCODE_S_R_E_FUNCTION_EXECUTED_NO_RETURN_STATEMENT MAKE_SQLSTATE('2','F', '0','0','5') +#define ERRCODE_S_R_E_FUNCTION_EXECUTED_NO_RETURN_STATEMENT MAKE_SQLSTATE('2','F', '0','0','5') #define ERRCODE_S_R_E_MODIFYING_SQL_DATA_NOT_PERMITTED MAKE_SQLSTATE('2','F', '0','0','2') #define ERRCODE_S_R_E_PROHIBITED_SQL_STATEMENT_ATTEMPTED MAKE_SQLSTATE('2','F', '0','0','3') #define ERRCODE_S_R_E_READING_SQL_DATA_NOT_PERMITTED MAKE_SQLSTATE('2','F', '0','0','4') @@ -255,15 +255,15 @@ #define ERRCODE_INVALID_COLUMN_REFERENCE MAKE_SQLSTATE('4','2', 'P','1','0') #define ERRCODE_INVALID_COLUMN_DEFINITION MAKE_SQLSTATE('4','2', '6','1','1') #define ERRCODE_INVALID_CURSOR_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','1') -#define ERRCODE_INVALID_DATABASE_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','2') -#define ERRCODE_INVALID_FUNCTION_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','3') +#define ERRCODE_INVALID_DATABASE_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','2') +#define ERRCODE_INVALID_FUNCTION_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','3') #define ERRCODE_INVALID_PSTATEMENT_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','4') #define ERRCODE_INVALID_SCHEMA_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','5') #define ERRCODE_INVALID_TABLE_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','6') #define ERRCODE_INVALID_OBJECT_DEFINITION MAKE_SQLSTATE('4','2', 'P','1','7') /* Class 44 - WITH CHECK OPTION Violation */ -#define ERRCODE_WITH_CHECK_OPTION_VIOLATION MAKE_SQLSTATE('4','4', '0','0','0') +#define ERRCODE_WITH_CHECK_OPTION_VIOLATION MAKE_SQLSTATE('4','4', '0','0','0') /* Class 53 - Insufficient Resources (PostgreSQL-specific error class) */ #define ERRCODE_INSUFFICIENT_RESOURCES MAKE_SQLSTATE('5','3', '0','0','0') diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index 979b5171e80..6b5816ddc86 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -7,7 +7,7 @@ * Copyright 2000-2003 by PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. * - * $Id: guc.h,v 1.38 2003/07/28 19:31:32 tgl Exp $ + * $Id: guc.h,v 1.39 2003/08/04 00:43:32 momjian Exp $ *-------------------------------------------------------------------- */ #ifndef GUC_H @@ -40,7 +40,7 @@ * configuration file, or by client request in the connection startup * packet (e.g., from libpq's PGOPTIONS variable). Furthermore, an * already-started backend will ignore changes to such an option in the - * configuration file. The idea is that these options are fixed for a + * configuration file. The idea is that these options are fixed for a * given backend once it's started, but they can vary across backends. * * SUSET options can be set at postmaster startup, with the SIGHUP @@ -146,8 +146,8 @@ extern ArrayType *GUCArrayAdd(ArrayType *array, const char *name, const char *va extern ArrayType *GUCArrayDelete(ArrayType *array, const char *name); #ifdef EXEC_BACKEND -void write_nondefault_variables(GucContext context); -void read_nondefault_variables(void); +void write_nondefault_variables(GucContext context); +void read_nondefault_variables(void); #endif #endif /* GUC_H */ diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h index b1abc0b1074..742b3b2ff64 100644 --- a/src/include/utils/guc_tables.h +++ b/src/include/utils/guc_tables.h @@ -7,7 +7,7 @@ * * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * - * $Id: guc_tables.h,v 1.4 2003/07/28 19:31:32 tgl Exp $ + * $Id: guc_tables.h,v 1.5 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,17 +68,17 @@ enum config_type * Generic fields applicable to all types of variables * * The short description should be less than 80 chars in length. Some - * applications may use the long description as well, and will append - * it to the short description. (separated by a newline or '. ') + * applications may use the long description as well, and will append + * it to the short description. (separated by a newline or '. ') */ struct config_generic { /* constant fields, must be set correctly in initial value: */ const char *name; /* name of variable - MUST BE FIRST */ GucContext context; /* context required to set the variable */ - enum config_group group; /* to help organize variables by function */ - const char *short_desc; /* short desc. of this variable's purpose */ - const char *long_desc; /* long desc. of this variable's purpose */ + enum config_group group; /* to help organize variables by function */ + const char *short_desc; /* short desc. of this variable's purpose */ + const char *long_desc; /* long desc. of this variable's purpose */ int flags; /* flag bits, see below */ /* variable fields, initialized at runtime: */ enum config_type vartype; /* type of variable (set only at startup) */ @@ -95,8 +95,8 @@ struct config_generic #define GUC_NO_SHOW_ALL 0x0004 /* exclude from SHOW ALL */ #define GUC_NO_RESET_ALL 0x0008 /* exclude from RESET ALL */ #define GUC_REPORT 0x0010 /* auto-report changes to client */ -#define GUC_NOT_IN_SAMPLE 0x0020 /* not in postgresql.conf.sample */ -#define GUC_DISALLOW_IN_FILE 0x0040 /* can't set in postgresql.conf */ +#define GUC_NOT_IN_SAMPLE 0x0020 /* not in postgresql.conf.sample */ +#define GUC_DISALLOW_IN_FILE 0x0040 /* can't set in postgresql.conf */ /* bit values in status field */ #define GUC_HAVE_TENTATIVE 0x0001 /* tentative value is defined */ @@ -167,10 +167,10 @@ struct config_string }; /* constant tables corresponding to enums above and in guc.h */ -extern const char * const config_group_names[]; -extern const char * const config_type_names[]; -extern const char * const GucContext_Names[]; -extern const char * const GucSource_Names[]; +extern const char *const config_group_names[]; +extern const char *const config_type_names[]; +extern const char *const GucContext_Names[]; +extern const char *const GucSource_Names[]; /* the current set of variables */ extern struct config_generic **guc_variables; diff --git a/src/include/utils/help_config.h b/src/include/utils/help_config.h index 45645f0216b..cd2c6e02fc7 100644 --- a/src/include/utils/help_config.h +++ b/src/include/utils/help_config.h @@ -1,11 +1,11 @@ /*------------------------------------------------------------------------- * * help_config.h - * Interface to the --help-config option of main.c - * + * Interface to the --help-config option of main.c + * * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * - * $Id: help_config.h,v 1.1 2003/07/04 16:41:22 tgl Exp $ + * $Id: help_config.h,v 1.2 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/inet.h b/src/include/utils/inet.h index dd6df6d56da..9b375ed24cb 100644 --- a/src/include/utils/inet.h +++ b/src/include/utils/inet.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: inet.h,v 1.14 2003/06/24 22:21:23 momjian Exp $ + * $Id: inet.h,v 1.15 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,7 +23,7 @@ typedef struct unsigned char family; unsigned char bits; unsigned char type; - unsigned char ip_addr[16]; /* 128 bits of address */ + unsigned char ip_addr[16]; /* 128 bits of address */ } inet_struct; /* diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index 1f8bcb06d1e..129492a3253 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lsyscache.h,v 1.76 2003/07/01 19:10:53 tgl Exp $ + * $Id: lsyscache.h,v 1.77 2003/08/04 00:43:32 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); @@ -67,13 +67,13 @@ extern void get_typlenbyval(Oid typid, int16 *typlen, bool *typbyval); extern void get_typlenbyvalalign(Oid typid, int16 *typlen, bool *typbyval, char *typalign); extern void get_type_io_data(Oid typid, - IOFuncSelector which_func, - int16 *typlen, - bool *typbyval, - char *typalign, - char *typdelim, - Oid *typelem, - Oid *func); + IOFuncSelector which_func, + int16 *typlen, + bool *typbyval, + char *typalign, + char *typdelim, + Oid *typelem, + Oid *func); extern char get_typstorage(Oid typid); extern int32 get_typtypmod(Oid typid); extern Node *get_typdefault(Oid typid); @@ -87,7 +87,7 @@ extern void getTypeOutputInfo(Oid type, Oid *typOutput, Oid *typElem, bool *typIsVarlena); extern void getTypeBinaryInputInfo(Oid type, Oid *typReceive, Oid *typElem); extern void getTypeBinaryOutputInfo(Oid type, Oid *typSend, Oid *typElem, - bool *typIsVarlena); + bool *typIsVarlena); extern Oid getBaseType(Oid typid); extern int32 get_typavgwidth(Oid typid, int32 typmod); extern int32 get_attavgwidth(Oid relid, AttrNumber attnum); diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index 6934d109623..6d04ddba5d5 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: memutils.h,v 1.51 2003/05/02 20:54:36 tgl Exp $ + * $Id: memutils.h,v 1.52 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -70,6 +70,7 @@ extern DLLIMPORT MemoryContext PostmasterContext; extern DLLIMPORT MemoryContext CacheMemoryContext; extern DLLIMPORT MemoryContext MessageContext; extern DLLIMPORT MemoryContext TopTransactionContext; + /* These two are transient links to contexts owned by other objects: */ extern DLLIMPORT MemoryContext QueryContext; extern DLLIMPORT MemoryContext PortalContext; @@ -127,8 +128,8 @@ extern MemoryContext AllocSetContextCreate(MemoryContext parent, * Recommended alloc parameters for "small" contexts that are not expected * to contain much data (for example, a context to contain a query plan). */ -#define ALLOCSET_SMALL_MINSIZE 0 +#define ALLOCSET_SMALL_MINSIZE 0 #define ALLOCSET_SMALL_INITSIZE (1 * 1024) -#define ALLOCSET_SMALL_MAXSIZE (8 * 1024) +#define ALLOCSET_SMALL_MAXSIZE (8 * 1024) #endif /* MEMUTILS_H */ diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index 7dabc52f318..7ba40efda9d 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -21,7 +21,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: palloc.h,v 1.24 2002/12/16 16:22:46 tgl Exp $ + * $Id: palloc.h,v 1.25 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,7 +51,7 @@ extern void *MemoryContextAllocZeroAligned(MemoryContext context, Size size); #define palloc(sz) MemoryContextAlloc(CurrentMemoryContext, (sz)) -#define palloc0(sz) MemoryContextAllocZero(CurrentMemoryContext, (sz)) +#define palloc0(sz) MemoryContextAllocZero(CurrentMemoryContext, (sz)) /* * The result of palloc() is always word-aligned, so we can skip testing @@ -61,7 +61,7 @@ extern void *MemoryContextAllocZeroAligned(MemoryContext context, Size size); * issue that it evaluates the argument multiple times isn't a problem in * practice. */ -#define palloc0fast(sz) \ +#define palloc0fast(sz) \ ( MemSetTest(0, sz) ? \ MemoryContextAllocZeroAligned(CurrentMemoryContext, sz) : \ MemoryContextAllocZero(CurrentMemoryContext, sz) ) diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 7da359cbe73..6c7664f04db 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -9,7 +9,7 @@ * * Scrolling (nonsequential access) and suspension of execution are allowed * only for portals that contain a single SELECT-type query. We do not want - * to let the client suspend an update-type query partway through! Because + * to let the client suspend an update-type query partway through! Because * the query rewriter does not allow arbitrary ON SELECT rewrite rules, * only queries that were originally update-type could produce multiple * parse/plan trees; so the restriction to a single query is not a problem @@ -18,13 +18,13 @@ * For SQL cursors, we support three kinds of scroll behavior: * * (1) Neither NO SCROLL nor SCROLL was specified: to remain backward - * compatible, we allow backward fetches here, unless it would - * impose additional runtime overhead to do so. + * compatible, we allow backward fetches here, unless it would + * impose additional runtime overhead to do so. * * (2) NO SCROLL was specified: don't allow any backward fetches. * * (3) SCROLL was specified: allow all kinds of backward fetches, even - * if we need to take a performance hit to do so. (The planner sticks + * if we need to take a performance hit to do so. (The planner sticks * a Materialize node atop the query plan if needed.) * * Case #1 is converted to #2 or #3 by looking at the query itself and @@ -39,7 +39,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: portal.h,v 1.44 2003/05/08 18:16:37 tgl Exp $ + * $Id: portal.h,v 1.45 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,8 +58,8 @@ * single result from the user's viewpoint. However, the rule rewriter * may expand the single source query to zero or many actual queries.) * - * PORTAL_ONE_SELECT: the portal contains one single SELECT query. We run - * the Executor incrementally as results are demanded. This strategy also + * PORTAL_ONE_SELECT: the portal contains one single SELECT query. We run + * the Executor incrementally as results are demanded. This strategy also * supports holdable cursors (the Executor results can be dumped into a * tuplestore for access after transaction completion). * @@ -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 @@ -89,7 +89,7 @@ typedef struct PortalData /* Bookkeeping data */ const char *name; /* portal's name */ MemoryContext heap; /* subsidiary memory for portal */ - void (*cleanup) (Portal portal, bool isError); /* cleanup hook */ + void (*cleanup) (Portal portal, bool isError); /* cleanup hook */ TransactionId createXact; /* the xid of the creating xact */ /* The query or queries the portal will execute */ @@ -97,15 +97,16 @@ typedef struct PortalData const char *commandTag; /* command tag for original query */ List *parseTrees; /* parse tree(s) */ List *planTrees; /* plan tree(s) */ - MemoryContext queryContext; /* where the above trees live */ + MemoryContext queryContext; /* where the above trees live */ + /* * Note: queryContext effectively identifies which prepared statement * the portal depends on, if any. The queryContext is *not* owned by - * the portal and is not to be deleted by portal destruction. (But for - * a cursor it is the same as "heap", and that context is deleted by - * portal destruction.) + * the portal and is not to be deleted by portal destruction. (But + * for a cursor it is the same as "heap", and that context is deleted + * by portal destruction.) */ - ParamListInfo portalParams; /* params to pass to query */ + ParamListInfo portalParams; /* params to pass to query */ /* Features/options */ PortalStrategy strategy; /* see above */ @@ -113,7 +114,7 @@ typedef struct PortalData /* Status data */ bool portalReady; /* PortalStart complete? */ - bool portalUtilReady; /* PortalRunUtility complete? */ + bool portalUtilReady; /* PortalRunUtility complete? */ bool portalActive; /* portal is running (can't delete it) */ bool portalDone; /* portal is finished (don't re-run it) */ @@ -126,21 +127,21 @@ typedef struct PortalData int16 *formats; /* a format code for each column */ /* - * Where we store tuples for a held cursor or a PORTAL_UTIL_SELECT query. - * (A cursor held past the end of its transaction no longer has any - * active executor state.) + * Where we store tuples for a held cursor or a PORTAL_UTIL_SELECT + * query. (A cursor held past the end of its transaction no longer has + * any active executor state.) */ - Tuplestorestate *holdStore; /* store for holdable cursors */ - MemoryContext holdContext; /* memory containing holdStore */ + Tuplestorestate *holdStore; /* store for holdable cursors */ + MemoryContext holdContext; /* memory containing holdStore */ /* * atStart, atEnd and portalPos indicate the current cursor position. - * portalPos is zero before the first row, N after fetching N'th row of - * query. After we run off the end, portalPos = # of rows in query, and - * atEnd is true. If portalPos overflows, set posOverflow (this causes - * us to stop relying on its value for navigation). Note that atStart - * implies portalPos == 0, but not the reverse (portalPos could have - * overflowed). + * portalPos is zero before the first row, N after fetching N'th row + * of query. After we run off the end, portalPos = # of rows in + * query, and atEnd is true. If portalPos overflows, set posOverflow + * (this causes us to stop relying on its value for navigation). Note + * that atStart implies portalPos == 0, but not the reverse (portalPos + * could have overflowed). */ bool atStart; bool atEnd; @@ -172,11 +173,11 @@ extern void PortalDrop(Portal portal, bool isError); extern void DropDependentPortals(MemoryContext queryContext); extern Portal GetPortalByName(const char *name); extern void PortalDefineQuery(Portal portal, - const char *sourceText, - const char *commandTag, - List *parseTrees, - List *planTrees, - MemoryContext queryContext); + const char *sourceText, + const char *commandTag, + List *parseTrees, + List *planTrees, + MemoryContext queryContext); extern void PortalCreateHoldStore(Portal portal); #endif /* PORTAL_H */ diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index fd5e0c56b76..29f1923b935 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rel.h,v 1.65 2003/05/28 16:04:02 tgl Exp $ + * $Id: rel.h,v 1.66 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -132,8 +132,8 @@ typedef struct RelationData /* These are non-NULL only for an index relation: */ Form_pg_index rd_index; /* pg_index tuple describing this index */ - struct HeapTupleData *rd_indextuple; /* all of pg_index tuple */ - /* "struct HeapTupleData *" avoids need to include htup.h here */ + struct HeapTupleData *rd_indextuple; /* all of pg_index tuple */ + /* "struct HeapTupleData *" avoids need to include htup.h here */ Form_pg_am rd_am; /* pg_am tuple for index's AM */ /* index access support info (used only for an index relation) */ diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index cea19f26930..3eec90c9423 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: selfuncs.h,v 1.13 2003/05/15 15:50:20 petere Exp $ + * $Id: selfuncs.h,v 1.14 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -66,16 +66,16 @@ extern Datum nlikejoinsel(PG_FUNCTION_ARGS); extern Datum icnlikejoinsel(PG_FUNCTION_ARGS); extern Selectivity booltestsel(Query *root, BoolTestType booltesttype, - Node *arg, int varRelid, JoinType jointype); + Node *arg, int varRelid, JoinType jointype); extern Selectivity nulltestsel(Query *root, NullTestType nulltesttype, - Node *arg, int varRelid); + Node *arg, int varRelid); extern void mergejoinscansel(Query *root, Node *clause, Selectivity *leftscan, Selectivity *rightscan); extern double estimate_num_groups(Query *root, List *groupExprs, - double input_rows); + double input_rows); extern Datum btcostestimate(PG_FUNCTION_ARGS); extern Datum rtcostestimate(PG_FUNCTION_ARGS); diff --git a/src/include/utils/tuplestore.h b/src/include/utils/tuplestore.h index 6a021ba52fd..4732a47ca78 100644 --- a/src/include/utils/tuplestore.h +++ b/src/include/utils/tuplestore.h @@ -8,7 +8,7 @@ * a dumbed-down version of tuplesort.c; it does no sorting of tuples * but can only store and regurgitate a sequence of tuples. However, * because no sort is required, it is allowed to start reading the sequence - * before it has all been written. This is particularly useful for cursors, + * before it has all been written. This is particularly useful for cursors, * because it allows random access within the already-scanned portion of * a query without having to process the underlying scan to completion. * A temporary file is used to handle the data if it exceeds the @@ -17,7 +17,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tuplestore.h,v 1.11 2003/04/29 03:21:30 tgl Exp $ + * $Id: tuplestore.h,v 1.12 2003/08/04 00:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,8 +37,8 @@ typedef struct Tuplestorestate Tuplestorestate; */ extern Tuplestorestate *tuplestore_begin_heap(bool randomAccess, - bool interXact, - int maxKBytes); + bool interXact, + int maxKBytes); extern void tuplestore_puttuple(Tuplestorestate *state, void *tuple); |