diff options
Diffstat (limited to 'src/include/access')
31 files changed, 72 insertions, 104 deletions
diff --git a/src/include/access/attnum.h b/src/include/access/attnum.h index babfa0b20e..2339c29030 100644 --- a/src/include/access/attnum.h +++ b/src/include/access/attnum.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: attnum.h,v 1.12 2001/01/24 19:43:19 momjian Exp $ + * $Id: attnum.h,v 1.13 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -59,5 +59,4 @@ typedef int16 AttrNumber; */ #define AttrOffsetGetAttrNumber(attributeOffset) \ ((AttrNumber) (1 + attributeOffset)) - #endif /* ATTNUM_H */ diff --git a/src/include/access/clog.h b/src/include/access/clog.h index 9bcd3a4294..60589e8bfc 100644 --- a/src/include/access/clog.h +++ b/src/include/access/clog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: clog.h,v 1.2 2001/09/29 04:02:26 tgl Exp $ + * $Id: clog.h,v 1.3 2001/10/25 05:49:55 momjian Exp $ */ #ifndef CLOG_H #define CLOG_H @@ -46,5 +46,4 @@ extern void TruncateCLOG(TransactionId oldestXact); extern void clog_redo(XLogRecPtr lsn, XLogRecord *record); extern void clog_undo(XLogRecPtr lsn, XLogRecord *record); extern void clog_desc(char *buf, uint8 xl_info, char *rec); - #endif /* CLOG_H */ diff --git a/src/include/access/genam.h b/src/include/access/genam.h index 0a70691e77..633fb21dfa 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: genam.h,v 1.27 2001/10/06 23:21:44 tgl Exp $ + * $Id: genam.h,v 1.28 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,9 +22,9 @@ /* Struct for statistics returned by bulk-delete operation */ typedef struct IndexBulkDeleteResult { - BlockNumber num_pages; /* pages remaining in index */ - double tuples_removed; /* # removed by bulk-delete operation */ - double num_index_tuples; /* # remaining */ + BlockNumber num_pages; /* pages remaining in index */ + double tuples_removed; /* # removed by bulk-delete operation */ + double num_index_tuples; /* # remaining */ } IndexBulkDeleteResult; /* Typedef for callback function to determine if a tuple is bulk-deletable */ @@ -51,17 +51,16 @@ extern void index_restrpos(IndexScanDesc scan); extern RetrieveIndexResult index_getnext(IndexScanDesc scan, ScanDirection direction); extern IndexBulkDeleteResult *index_bulk_delete(Relation relation, - IndexBulkDeleteCallback callback, - void *callback_state); + IndexBulkDeleteCallback callback, + void *callback_state); extern RegProcedure index_cost_estimator(Relation relation); extern RegProcedure index_getprocid(Relation irel, AttrNumber attnum, uint16 procnum); extern struct FmgrInfo *index_getprocinfo(Relation irel, AttrNumber attnum, - uint16 procnum); + uint16 procnum); /* in genam.c */ extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd, uint16 numberOfKeys, ScanKey key); extern void IndexScanEnd(IndexScanDesc scan); - #endif /* GENAM_H */ diff --git a/src/include/access/gist.h b/src/include/access/gist.h index d6bce8d845..e7cff61ee8 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: gist.h,v 1.32 2001/08/22 18:24:26 tgl Exp $ + * $Id: gist.h,v 1.33 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -123,20 +123,22 @@ typedef struct GIST_SPLITVEC OffsetNumber *spl_left; /* array of entries that go left */ int spl_nleft; /* size of this array */ Datum spl_ldatum; /* Union of keys in spl_left */ - Datum spl_lattr[INDEX_MAX_KEYS]; /* Union of subkeys in spl_left */ - int spl_lattrsize[INDEX_MAX_KEYS]; - bool spl_lisnull[INDEX_MAX_KEYS]; + Datum spl_lattr[INDEX_MAX_KEYS]; /* Union of subkeys in + * spl_left */ + int spl_lattrsize[INDEX_MAX_KEYS]; + bool spl_lisnull[INDEX_MAX_KEYS]; OffsetNumber *spl_right; /* array of entries that go right */ int spl_nright; /* size of the array */ Datum spl_rdatum; /* Union of keys in spl_right */ - Datum spl_rattr[INDEX_MAX_KEYS]; /* Union of subkeys in spl_right */ - int spl_rattrsize[INDEX_MAX_KEYS]; - bool spl_risnull[INDEX_MAX_KEYS]; - - int *spl_idgrp; - int *spl_ngrp; /* number in each group */ - char *spl_grpflag; /* flags of each group */ + Datum spl_rattr[INDEX_MAX_KEYS]; /* Union of subkeys in + * spl_right */ + int spl_rattrsize[INDEX_MAX_KEYS]; + bool spl_risnull[INDEX_MAX_KEYS]; + + int *spl_idgrp; + int *spl_ngrp; /* number in each group */ + char *spl_grpflag; /* flags of each group */ } GIST_SPLITVEC; /* @@ -171,10 +173,10 @@ extern void gistfreestack(GISTSTACK *s); extern void initGISTstate(GISTSTATE *giststate, Relation index); extern void freeGISTstate(GISTSTATE *giststate); extern void gistdentryinit(GISTSTATE *giststate, int nkey, GISTENTRY *e, - Datum k, Relation r, Page pg, OffsetNumber o, - int b, bool l, bool isNull); + Datum k, Relation r, Page pg, OffsetNumber o, + int b, bool l, bool isNull); extern StrategyNumber RelationGetGISTStrategy(Relation, AttrNumber, - RegProcedure); + RegProcedure); extern void gist_redo(XLogRecPtr lsn, XLogRecord *record); extern void gist_undo(XLogRecPtr lsn, XLogRecord *record); @@ -182,5 +184,4 @@ extern void gist_desc(char *buf, uint8 xl_info, char *rec); /* gistget.c */ extern Datum gistgettuple(PG_FUNCTION_ARGS); - #endif /* GIST_H */ diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h index f7955bce9e..ade886b077 100644 --- a/src/include/access/gistscan.h +++ b/src/include/access/gistscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: gistscan.h,v 1.16 2001/07/15 22:48:18 tgl Exp $ + * $Id: gistscan.h,v 1.17 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,5 +23,4 @@ extern Datum gistrestrpos(PG_FUNCTION_ARGS); extern Datum gistendscan(PG_FUNCTION_ARGS); extern void gistadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); extern void AtEOXact_gist(void); - #endif /* GISTSCAN_H */ diff --git a/src/include/access/hash.h b/src/include/access/hash.h index e973b81a7c..11950f5664 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: hash.h,v 1.39 2001/07/15 22:48:18 tgl Exp $ + * $Id: hash.h,v 1.40 2001/10/25 05:49:55 momjian Exp $ * * NOTES * modeled after Margo Seltzer's hash implementation for unix. @@ -81,8 +81,8 @@ typedef struct HashPageOpaqueData bits16 hasho_flag; /* is this page a bucket or ovfl */ Bucket hasho_bucket; /* bucket number this pg belongs to */ OverflowPageAddress hasho_oaddr; /* ovfl address of this ovfl pg */ - BlockNumber hasho_nextblkno;/* next ovfl blkno */ - BlockNumber hasho_prevblkno;/* previous ovfl (or bucket) blkno */ + BlockNumber hasho_nextblkno; /* next ovfl blkno */ + BlockNumber hasho_prevblkno; /* previous ovfl (or bucket) blkno */ } HashPageOpaqueData; typedef HashPageOpaqueData *HashPageOpaque; @@ -150,12 +150,12 @@ typedef struct HashMetaPageData uint16 hashm_bshift; /* bucket shift */ uint16 hashm_bmsize; /* bitmap array size (bytes) - must be a * power of 2 */ - uint32 hashm_maxbucket;/* ID of maximum bucket in use */ + uint32 hashm_maxbucket; /* ID of maximum bucket in use */ uint32 hashm_highmask; /* mask to modulo into entire table */ uint32 hashm_lowmask; /* mask to modulo into lower half of table */ uint32 hashm_ovflpoint;/* pageno. from which ovflpgs being * allocated */ - uint32 hashm_lastfreed;/* last ovflpage freed */ + uint32 hashm_lastfreed; /* last ovflpage freed */ uint32 hashm_nmaps; /* Initial number of bitmaps */ uint32 hashm_spares[NCACHED]; /* spare pages available at * splitpoints */ @@ -327,5 +327,4 @@ extern void _hash_checkpage(Page page, int flags); extern void hash_redo(XLogRecPtr lsn, XLogRecord *record); extern void hash_undo(XLogRecPtr lsn, XLogRecord *record); extern void hash_desc(char *buf, uint8 xl_info, char *rec); - #endif /* HASH_H */ diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index 095476083b..ae51658305 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.68 2001/09/17 00:29:10 tgl Exp $ + * $Id: heapam.h,v 1.69 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -141,7 +141,6 @@ extern Datum nocachegetattr(HeapTuple tup, int attnum, extern Datum fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc, bool *isnull); - #endif /* defined(DISABLE_COMPLEX_MACRO) */ @@ -221,10 +220,10 @@ 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, - char *unused, int unlen); + char *unused, int unlen); extern XLogRecPtr log_heap_move(Relation reln, Buffer oldbuf, - ItemPointerData from, - Buffer newbuf, HeapTuple newtup); + ItemPointerData from, + Buffer newbuf, HeapTuple newtup); /* in common/heaptuple.c */ extern Size ComputeDataSize(TupleDesc tupleDesc, Datum *value, char *nulls); @@ -246,5 +245,4 @@ extern HeapTuple heap_addheader(int natts, Size structlen, void *structure); /* in common/heap/stats.c */ extern void PrintHeapAccessStatistics(HeapAccessStatistics stats); extern void initam(void); - #endif /* HEAPAM_H */ diff --git a/src/include/access/hio.h b/src/include/access/hio.h index da4114c0d0..c6a5eac0e7 100644 --- a/src/include/access/hio.h +++ b/src/include/access/hio.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: hio.h,v 1.19 2001/06/29 21:08:25 tgl Exp $ + * $Id: hio.h,v 1.20 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,6 +19,5 @@ extern void RelationPutHeapTuple(Relation relation, Buffer buffer, HeapTuple tuple); extern Buffer RelationGetBufferForTuple(Relation relation, Size len, - Buffer otherBuffer); - + Buffer otherBuffer); #endif /* HIO_H */ diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 8de6fa852f..257b9d8a4a 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: htup.h,v 1.48 2001/03/25 22:40:58 tgl Exp $ + * $Id: htup.h,v 1.49 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -275,5 +275,4 @@ typedef HeapTupleData *HeapTuple; #define HeapTupleHasExtended(tuple) \ ((((HeapTuple)(tuple))->t_data->t_infomask & HEAP_HASEXTENDED) != 0) - #endif /* HTUP_H */ diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h index 15b45a8b12..b724bfaa5e 100644 --- a/src/include/access/ibit.h +++ b/src/include/access/ibit.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: ibit.h,v 1.15 2001/01/24 19:43:19 momjian Exp $ + * $Id: ibit.h,v 1.16 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,5 +28,4 @@ typedef IndexAttributeBitMapData *IndexAttributeBitMap; * True iff attribute bit map is valid. */ #define IndexAttributeBitMapIsValid(bits) PointerIsValid(bits) - #endif /* IBIT_H */ diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h index 4a3768a7d3..514bec3844 100644 --- a/src/include/access/iqual.h +++ b/src/include/access/iqual.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: iqual.h,v 1.15 2001/01/24 19:43:19 momjian Exp $ + * $Id: iqual.h,v 1.16 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,5 +27,4 @@ extern int NIndexTupleProcessed; extern bool index_keytest(IndexTuple tuple, TupleDesc tupdesc, int scanKeySize, ScanKey key); - #endif /* IQUAL_H */ diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h index bb12a5eafb..6f94b8ccc6 100644 --- a/src/include/access/istrat.h +++ b/src/include/access/istrat.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: istrat.h,v 1.20 2001/03/22 04:00:28 momjian Exp $ + * $Id: istrat.h,v 1.21 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,5 +63,4 @@ extern void IndexSupportInitialize(IndexStrategy indexStrategy, StrategyNumber maxStrategyNumber, StrategyNumber maxSupportNumber, AttrNumber maxAttributeNumber); - #endif /* ISTRAT_H */ diff --git a/src/include/access/itup.h b/src/include/access/itup.h index bf31c9e2a8..4e7835df80 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: itup.h,v 1.31 2001/03/22 04:00:29 momjian Exp $ + * $Id: itup.h,v 1.32 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -151,5 +151,4 @@ extern RetrieveIndexResult FormRetrieveIndexResult(ItemPointer indexItemPointer, ItemPointer heapItemPointer); extern void CopyIndexTuple(IndexTuple source, IndexTuple *target); - #endif /* ITUP_H */ diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index 789dd02742..b0e1dd305d 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nbtree.h,v 1.56 2001/07/15 22:48:18 tgl Exp $ + * $Id: nbtree.h,v 1.57 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -398,5 +398,4 @@ extern BTSpool *_bt_spoolinit(Relation index, bool isunique); extern void _bt_spooldestroy(BTSpool *btspool); extern void _bt_spool(BTItem btitem, BTSpool *btspool); extern void _bt_leafbuild(BTSpool *btspool, BTSpool *spool2); - #endif /* NBTREE_H */ diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h index eab2fd3db1..0f1dbed15b 100644 --- a/src/include/access/printtup.h +++ b/src/include/access/printtup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: printtup.h,v 1.15 2001/03/22 04:00:29 momjian Exp $ + * $Id: printtup.h,v 1.16 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,5 +28,4 @@ extern void spi_printtup(HeapTuple tuple, TupleDesc tupdesc, extern bool getTypeOutputInfo(Oid type, Oid *typOutput, Oid *typElem, bool *typIsVarlena); - #endif /* PRINTTUP_H */ diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index 907ecee230..87e1b36c3f 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: relscan.h,v 1.22 2001/06/22 19:16:23 wieck Exp $ + * $Id: relscan.h,v 1.23 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,7 @@ typedef struct HeapScanDescData uint16 rs_nkeys; /* number of scan keys to select tuples */ ScanKey rs_key; /* key descriptors */ - PgStat_Info rs_pgstat_info; /* statistics collector hook */ + PgStat_Info rs_pgstat_info; /* statistics collector hook */ } HeapScanDescData; typedef HeapScanDescData *HeapScanDesc; @@ -38,14 +38,14 @@ typedef struct IndexScanDescData Relation relation; /* relation descriptor */ void *opaque; /* access-method-specific info */ ItemPointerData currentItemData; /* current index pointer */ - ItemPointerData currentMarkData; /* marked current pointer */ + ItemPointerData currentMarkData; /* marked current pointer */ uint8 flags; /* scan position flags */ bool scanFromEnd; /* restart scan at end? */ uint16 numberOfKeys; /* number of scan keys to select tuples */ ScanKey keyData; /* key descriptors */ FmgrInfo fn_getnext; /* cached lookup info for am's getnext fn */ - PgStat_Info xs_pgstat_info; /* statistics collector hook */ + PgStat_Info xs_pgstat_info; /* statistics collector hook */ } IndexScanDescData; typedef IndexScanDescData *IndexScanDesc; @@ -75,5 +75,4 @@ typedef IndexScanDesc *IndexScanDescPtr; * True iff the index scan is valid. */ #define IndexScanIsValid(scan) PointerIsValid(scan) - #endif /* RELSCAN_H */ diff --git a/src/include/access/rmgr.h b/src/include/access/rmgr.h index b658422fd2..106370858d 100644 --- a/src/include/access/rmgr.h +++ b/src/include/access/rmgr.h @@ -3,7 +3,7 @@ * * Resource managers definition * - * $Id: rmgr.h,v 1.6 2001/08/25 18:52:42 tgl Exp $ + * $Id: rmgr.h,v 1.7 2001/10/25 05:49:55 momjian Exp $ */ #ifndef RMGR_H #define RMGR_H @@ -24,5 +24,4 @@ typedef uint8 RmgrId; #define RM_GIST_ID 14 #define RM_SEQ_ID 15 #define RM_MAX_ID RM_SEQ_ID - #endif /* RMGR_H */ diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h index 237937fe46..b9737ceeec 100644 --- a/src/include/access/rtree.h +++ b/src/include/access/rtree.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rtree.h,v 1.24 2001/07/15 22:48:18 tgl Exp $ + * $Id: rtree.h,v 1.25 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -134,5 +134,4 @@ extern void AtEOXact_rtree(void); /* rtstrat.c */ extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum, RegProcedure proc); - #endif /* RTREE_H */ diff --git a/src/include/access/rtscan.h b/src/include/access/rtscan.h index efdf44f072..5cfba8e08f 100644 --- a/src/include/access/rtscan.h +++ b/src/include/access/rtscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rtscan.h,v 1.10 2001/01/24 19:43:19 momjian Exp $ + * $Id: rtscan.h,v 1.11 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,5 +19,4 @@ #include "utils/rel.h" void rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); - #endif /* RTSCAN_H */ diff --git a/src/include/access/sdir.h b/src/include/access/sdir.h index a9229c89c3..3caa8b3ae4 100644 --- a/src/include/access/sdir.h +++ b/src/include/access/sdir.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sdir.h,v 1.9 2001/01/24 19:43:19 momjian Exp $ + * $Id: sdir.h,v 1.10 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,9 +21,9 @@ */ typedef enum ScanDirection { - BackwardScanDirection = -1, - NoMovementScanDirection = 0, - ForwardScanDirection = 1 + BackwardScanDirection = -1, + NoMovementScanDirection = 0, + ForwardScanDirection = 1 } ScanDirection; /* @@ -54,5 +54,4 @@ typedef enum ScanDirection */ #define ScanDirectionIsForward(direction) \ ((bool) ((direction) == ForwardScanDirection)) - #endif /* SDIR_H */ diff --git a/src/include/access/skey.h b/src/include/access/skey.h index 304d5e4a46..45061e38ff 100644 --- a/src/include/access/skey.h +++ b/src/include/access/skey.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: skey.h,v 1.17 2001/10/06 23:21:44 tgl Exp $ + * $Id: skey.h,v 1.18 2001/10/25 05:49:55 momjian Exp $ * * Note: * Needs more accessor/assignment routines. @@ -45,7 +45,6 @@ extern void ScanKeyEntrySetIllegal(ScanKey entry); extern void ScanKeyEntryInitialize(ScanKey entry, bits16 flags, AttrNumber attributeNumber, RegProcedure procedure, Datum argument); extern void ScanKeyEntryInitializeWithInfo(ScanKey entry, bits16 flags, - AttrNumber attributeNumber, FmgrInfo *finfo, - MemoryContext mcxt, Datum argument); - + AttrNumber attributeNumber, FmgrInfo *finfo, + MemoryContext mcxt, Datum argument); #endif /* SKEY_H */ diff --git a/src/include/access/strat.h b/src/include/access/strat.h index ffe63926cf..7c376ac37c 100644 --- a/src/include/access/strat.h +++ b/src/include/access/strat.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: strat.h,v 1.22 2001/05/30 19:53:39 tgl Exp $ + * $Id: strat.h,v 1.23 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,7 +40,7 @@ typedef StrategyOperatorData *StrategyOperator; typedef struct StrategyTermData { /* conjunctive term */ uint16 degree; - StrategyOperatorData operatorData[1]; /* VARIABLE LENGTH ARRAY */ + StrategyOperatorData operatorData[1]; /* VARIABLE LENGTH ARRAY */ } StrategyTermData; /* VARIABLE LENGTH STRUCTURE */ typedef StrategyTermData *StrategyTerm; @@ -86,5 +86,4 @@ typedef struct IndexStrategyData } IndexStrategyData; /* VARIABLE LENGTH STRUCTURE */ typedef IndexStrategyData *IndexStrategy; - #endif /* STRAT_H */ diff --git a/src/include/access/transam.h b/src/include/access/transam.h index e6fda69691..e8fc34fd90 100644 --- a/src/include/access/transam.h +++ b/src/include/access/transam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: transam.h,v 1.41 2001/09/29 04:02:26 tgl Exp $ + * $Id: transam.h,v 1.42 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,7 +39,7 @@ #define TransactionIdIsNormal(xid) ((xid) >= FirstNormalTransactionId) #define TransactionIdEquals(id1, id2) ((id1) == (id2)) #define TransactionIdStore(xid, dest) (*(dest) = (xid)) -#define StoreInvalidTransactionId(dest) (*(dest) = InvalidTransactionId) +#define StoreInvalidTransactionId(dest) (*(dest) = InvalidTransactionId) /* advance a transaction ID variable, handling wraparound correctly */ #define TransactionIdAdvance(dest) \ do { \ @@ -58,7 +58,7 @@ * OIDS 10000-16383 are reserved for assignment by genbki.sh. * * OIDs beginning at 16384 are assigned at runtime from the OID - * generator. (The first few of these will be assigned during initdb, + * generator. (The first few of these will be assigned during initdb, * to objects created after the initial BKI script processing.) * * The choices of 10000 and 16384 are completely arbitrary, and can be moved @@ -121,5 +121,4 @@ extern bool AMI_OVERRIDE; /* in varsup.c */ extern VariableCache ShmemVariableCache; - #endif /* TRAMSAM_H */ diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index 644fe201f9..afb96c37a3 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tupdesc.h,v 1.30 2001/01/24 19:43:20 momjian Exp $ + * $Id: tupdesc.h,v 1.31 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -74,5 +74,4 @@ extern bool TupleDescInitEntry(TupleDesc desc, bool attisset); extern TupleDesc BuildDescForRelation(List *schema, char *relname); - #endif /* TUPDESC_H */ diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h index f1bf680f31..97fb618ce1 100644 --- a/src/include/access/tupmacs.h +++ b/src/include/access/tupmacs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tupmacs.h,v 1.17 2001/03/22 04:00:31 momjian Exp $ + * $Id: tupmacs.h,v 1.18 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -90,7 +90,6 @@ : \ PointerGetDatum((char *) (T)) \ ) - #endif /* SIZEOF_DATUM == 8 */ /* @@ -179,7 +178,5 @@ break; \ } \ } while (0) - #endif /* SIZEOF_DATUM == 8 */ - #endif diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h index 6e38529204..99ea8d5998 100644 --- a/src/include/access/tuptoaster.h +++ b/src/include/access/tuptoaster.h @@ -6,7 +6,7 @@ * * Copyright (c) 2000, PostgreSQL Development Team * - * $Id: tuptoaster.h,v 1.11 2001/05/07 00:43:24 tgl Exp $ + * $Id: tuptoaster.h,v 1.12 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -115,5 +115,4 @@ extern Datum toast_compress_datum(Datum value); */ extern Size toast_raw_datum_size(Datum value); - #endif /* TUPTOASTER_H */ diff --git a/src/include/access/valid.h b/src/include/access/valid.h index d1e7f14173..d1e32602a3 100644 --- a/src/include/access/valid.h +++ b/src/include/access/valid.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: valid.h,v 1.23 2001/01/24 19:43:20 momjian Exp $ + * $Id: valid.h,v 1.24 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -130,5 +130,4 @@ do \ (tuple)->t_data = NULL; \ } \ } while (0) - #endif /* VALID_H */ diff --git a/src/include/access/xact.h b/src/include/access/xact.h index 557e0768c3..f85e21eee4 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xact.h,v 1.38 2001/10/18 17:30:15 thomas Exp $ + * $Id: xact.h,v 1.39 2001/10/25 05:49:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -134,5 +134,4 @@ extern Datum xidin(PG_FUNCTION_ARGS); extern Datum xidout(PG_FUNCTION_ARGS); extern Datum xideq(PG_FUNCTION_ARGS); extern Datum xid_age(PG_FUNCTION_ARGS); - #endif /* XACT_H */ diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index dd5f0284a1..04bb18b2e5 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xlog.h,v 1.25 2001/08/25 18:52:42 tgl Exp $ + * $Id: xlog.h,v 1.26 2001/10/25 05:49:56 momjian Exp $ */ #ifndef XLOG_H #define XLOG_H @@ -103,7 +103,7 @@ typedef struct XLogContRecord /* ACTUAL LOG DATA FOLLOWS AT END OF STRUCT */ -} XLogContRecord; +} XLogContRecord; #define SizeOfXLogContRecord MAXALIGN(sizeof(XLogContRecord)) @@ -215,5 +215,4 @@ extern XLogRecPtr GetUndoRecPtr(void); extern bool check_xlog_sync_method(const char *method); extern void assign_xlog_sync_method(const char *method); - #endif /* XLOG_H */ diff --git a/src/include/access/xlogdefs.h b/src/include/access/xlogdefs.h index 916474bd97..c2d1f2168e 100644 --- a/src/include/access/xlogdefs.h +++ b/src/include/access/xlogdefs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xlogdefs.h,v 1.4 2001/08/25 18:52:42 tgl Exp $ + * $Id: xlogdefs.h,v 1.5 2001/10/25 05:49:56 momjian Exp $ */ #ifndef XLOG_DEFS_H #define XLOG_DEFS_H @@ -55,5 +55,4 @@ typedef struct XLogRecPtr * pg_clog after shutdown, in future. */ typedef uint32 StartUpID; - #endif /* XLOG_DEFS_H */ diff --git a/src/include/access/xlogutils.h b/src/include/access/xlogutils.h index b427c83649..b49bcbe134 100644 --- a/src/include/access/xlogutils.h +++ b/src/include/access/xlogutils.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xlogutils.h,v 1.8 2001/08/25 18:52:42 tgl Exp $ + * $Id: xlogutils.h,v 1.9 2001/10/25 05:49:56 momjian Exp $ */ #ifndef XLOG_UTILS_H #define XLOG_UTILS_H @@ -25,5 +25,4 @@ extern void XLogCloseRelationCache(void); extern Relation XLogOpenRelation(bool redo, RmgrId rmid, RelFileNode rnode); extern Buffer XLogReadBuffer(bool extend, Relation reln, BlockNumber blkno); - #endif |