diff options
Diffstat (limited to 'src/backend/access')
-rw-r--r-- | src/backend/access/common/tupdesc.c | 4 | ||||
-rw-r--r-- | src/backend/access/gist/gist.c | 6 | ||||
-rw-r--r-- | src/backend/access/hash/hash.c | 4 | ||||
-rw-r--r-- | src/backend/access/hash/hashovfl.c | 8 | ||||
-rw-r--r-- | src/backend/access/hash/hashpage.c | 4 | ||||
-rw-r--r-- | src/backend/access/hash/hashsearch.c | 10 | ||||
-rw-r--r-- | src/backend/access/heap/heapam.c | 8 | ||||
-rw-r--r-- | src/backend/access/nbtree/nbtpage.c | 4 | ||||
-rw-r--r-- | src/backend/access/nbtree/nbtree.c | 4 | ||||
-rw-r--r-- | src/backend/access/nbtree/nbtscan.c | 4 | ||||
-rw-r--r-- | src/backend/access/nbtree/nbtsearch.c | 14 | ||||
-rw-r--r-- | src/backend/access/nbtree/nbtsort.c | 54 | ||||
-rw-r--r-- | src/backend/access/rtree/rtproc.c | 11 | ||||
-rw-r--r-- | src/backend/access/rtree/rtree.c | 4 | ||||
-rw-r--r-- | src/backend/access/transam/transam.c | 6 | ||||
-rw-r--r-- | src/backend/access/transam/transsup.c | 4 |
16 files changed, 75 insertions, 74 deletions
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c index d4b5e893bdd..f0bcd60493e 100644 --- a/src/backend/access/common/tupdesc.c +++ b/src/backend/access/common/tupdesc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.21 1997/09/08 02:19:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.22 1997/09/08 20:53:40 momjian Exp $ * * NOTES * some of the executor utility code such as "ExecTypeFromTL" should be @@ -75,7 +75,7 @@ CreateTemplateTupleDesc(int natts) * ---------------------------------------------------------------- */ TupleDesc -CreateTupleDesc(int natts, AttributeTupleForm * attrs) +CreateTupleDesc(int natts, AttributeTupleForm *attrs) { TupleDesc desc; diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index d12e4e5c6ea..b35cf77573e 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -59,7 +59,7 @@ static void GISTInitBuffer(Buffer b, uint32 f); static BlockNumber gistChooseSubtree(Relation r, IndexTuple itup, int level, GISTSTATE * giststate, - GISTSTACK ** retstack, Buffer * leafbuf); + GISTSTACK ** retstack, Buffer *leafbuf); static OffsetNumber gistchoose(Relation r, Page p, IndexTuple it, GISTSTATE * giststate); @@ -78,7 +78,7 @@ void gistbuild(Relation heap, Relation index, int natts, - AttrNumber * attnum, + AttrNumber *attnum, IndexStrategy istrat, uint16 pint, Datum * params, @@ -470,7 +470,7 @@ gistChooseSubtree(Relation r, IndexTuple itup, /* itup has compressed int level, GISTSTATE * giststate, GISTSTACK ** retstack /* out */ , - Buffer * leafbuf /* out */ ) + Buffer *leafbuf /* out */ ) { Buffer buffer; BlockNumber blk; diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index 97e1a631a1e..427c222dfcf 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.14 1997/09/08 02:20:10 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.15 1997/09/08 20:53:53 momjian Exp $ * * NOTES * This file contains only the public interface routines. @@ -45,7 +45,7 @@ void hashbuild(Relation heap, Relation index, int natts, - AttrNumber * attnum, + AttrNumber *attnum, IndexStrategy istrat, uint16 pcount, Datum * params, diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c index 5d764b34724..9954fb90d08 100644 --- a/src/backend/access/hash/hashovfl.c +++ b/src/backend/access/hash/hashovfl.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.11 1997/09/08 02:20:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.12 1997/09/08 20:53:59 momjian Exp $ * * NOTES * Overflow pages look like ordinary relation pages. @@ -26,7 +26,7 @@ #include <string.h> #endif -static OverflowPageAddress _hash_getovfladdr(Relation rel, Buffer * metabufp); +static OverflowPageAddress _hash_getovfladdr(Relation rel, Buffer *metabufp); static uint32 _hash_firstfreebit(uint32 map); /* @@ -40,7 +40,7 @@ static uint32 _hash_firstfreebit(uint32 map); * */ Buffer -_hash_addovflpage(Relation rel, Buffer * metabufp, Buffer buf) +_hash_addovflpage(Relation rel, Buffer *metabufp, Buffer buf) { OverflowPageAddress oaddr; @@ -100,7 +100,7 @@ _hash_addovflpage(Relation rel, Buffer * metabufp, Buffer buf) * */ static OverflowPageAddress -_hash_getovfladdr(Relation rel, Buffer * metabufp) +_hash_getovfladdr(Relation rel, Buffer *metabufp) { HashMetaPage metap; Buffer mapbuf = 0; diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c index 17fdaab37fd..259f3cbe20c 100644 --- a/src/backend/access/hash/hashpage.c +++ b/src/backend/access/hash/hashpage.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.11 1997/09/08 02:20:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.12 1997/09/08 20:54:03 momjian Exp $ * * NOTES * Postgres hash pages look like ordinary relation pages. The opaque @@ -270,7 +270,7 @@ _hash_wrtnorelbuf(Relation rel, Buffer buf) Page _hash_chgbufaccess(Relation rel, - Buffer * bufp, + Buffer *bufp, int from_access, int to_access) { diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c index 7c3b91b9c0c..4c161edb891 100644 --- a/src/backend/access/hash/hashsearch.c +++ b/src/backend/access/hash/hashsearch.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.12 1997/09/08 02:20:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.13 1997/09/08 20:54:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,7 @@ void _hash_search(Relation rel, int keysz, ScanKey scankey, - Buffer * bufP, + Buffer *bufP, HashMetaPage metap) { BlockNumber blkno; @@ -127,7 +127,7 @@ _hash_next(IndexScanDesc scan, ScanDirection dir) static void _hash_readnext(Relation rel, - Buffer * bufp, Page * pagep, HashPageOpaque * opaquep) + Buffer *bufp, Page * pagep, HashPageOpaque * opaquep) { BlockNumber blkno; @@ -146,7 +146,7 @@ _hash_readnext(Relation rel, static void _hash_readprev(Relation rel, - Buffer * bufp, Page * pagep, HashPageOpaque * opaquep) + Buffer *bufp, Page * pagep, HashPageOpaque * opaquep) { BlockNumber blkno; @@ -284,7 +284,7 @@ _hash_first(IndexScanDesc scan, ScanDirection dir) * 'metabuf' is released when this returns. */ bool -_hash_step(IndexScanDesc scan, Buffer * bufP, ScanDirection dir, Buffer metabuf) +_hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir, Buffer metabuf) { Relation rel; ItemPointer current; diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index fa4dbae7ae1..e1f969dffa2 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.17 1997/09/08 02:20:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.18 1997/09/08 20:54:08 momjian Exp $ * * * INTERFACE ROUTINES @@ -214,7 +214,7 @@ static HeapTuple heapgettup(Relation relation, ItemPointer tid, int dir, - Buffer * b, + Buffer *b, TimeQual timeQual, int nkeys, ScanKey key) @@ -805,7 +805,7 @@ elog(DEBUG, "heap_getnext([%s,nkeys=%d],backw=%d,0x%x) called", \ HeapTuple heap_getnext(HeapScanDesc scandesc, int backw, - Buffer * b) + Buffer *b) { register HeapScanDesc sdesc = scandesc; Buffer localb; @@ -1033,7 +1033,7 @@ HeapTuple heap_fetch(Relation relation, TimeQual timeQual, ItemPointer tid, - Buffer * b) + Buffer *b) { ItemId lp; Buffer buffer; diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index fe3bebbccdf..7bd074c09a2 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.11 1997/09/08 02:20:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.12 1997/09/08 20:54:15 momjian Exp $ * * NOTES * Postgres btree pages look like ordinary relation pages. The opaque @@ -56,7 +56,7 @@ typedef struct BTMetaPageData #ifdef BTREE_VERSION_1 int32 btm_level; #endif -} BTMetaPageData; +} BTMetaPageData; #define BTPageGetMeta(p) \ ((BTMetaPageData *) &((PageHeader) p)->pd_linp[0]) diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index 9f7b59327a9..203772ee2d4 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.21 1997/09/08 02:20:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.22 1997/09/08 20:54:21 momjian Exp $ * * NOTES * This file contains only the public interface routines. @@ -56,7 +56,7 @@ void btbuild(Relation heap, Relation index, int natts, - AttrNumber * attnum, + AttrNumber *attnum, IndexStrategy istrat, uint16 pcount, Datum * params, diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c index 4f3ee1ffe62..7263a09dcf5 100644 --- a/src/backend/access/nbtree/nbtscan.c +++ b/src/backend/access/nbtree/nbtscan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.9 1997/09/08 02:20:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.10 1997/09/08 20:54:24 momjian Exp $ * * * NOTES @@ -36,7 +36,7 @@ typedef struct BTScanListData { IndexScanDesc btsl_scan; struct BTScanListData *btsl_next; -} BTScanListData; +} BTScanListData; typedef BTScanListData *BTScanList; diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index 50f2031779f..7b7a4ee2bdf 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.25 1997/09/08 02:20:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.26 1997/09/08 20:54:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,7 @@ static BTStack _bt_searchr(Relation rel, int keysz, ScanKey scankey, - Buffer * bufP, BTStack stack_in); + Buffer *bufP, BTStack stack_in); static OffsetNumber _bt_firsteq(Relation rel, TupleDesc itupdesc, Page page, Size keysz, ScanKey scankey, OffsetNumber offnum); @@ -38,7 +38,7 @@ static int _bt_compare(Relation rel, TupleDesc itupdesc, Page page, int keysz, ScanKey scankey, OffsetNumber offnum); static bool - _bt_twostep(IndexScanDesc scan, Buffer * bufP, ScanDirection dir); + _bt_twostep(IndexScanDesc scan, Buffer *bufP, ScanDirection dir); static RetrieveIndexResult _bt_endpoint(IndexScanDesc scan, ScanDirection dir); @@ -49,7 +49,7 @@ static RetrieveIndexResult * calls a recursive-descent search routine on the tree. */ BTStack -_bt_search(Relation rel, int keysz, ScanKey scankey, Buffer * bufP) +_bt_search(Relation rel, int keysz, ScanKey scankey, Buffer *bufP) { *bufP = _bt_getroot(rel, BT_READ); return (_bt_searchr(rel, keysz, scankey, bufP, (BTStack) NULL)); @@ -62,7 +62,7 @@ static BTStack _bt_searchr(Relation rel, int keysz, ScanKey scankey, - Buffer * bufP, + Buffer *bufP, BTStack stack_in) { BTStack stack; @@ -1060,7 +1060,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir) * scan to the right thing. */ bool -_bt_step(IndexScanDesc scan, Buffer * bufP, ScanDirection dir) +_bt_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir) { Page page; BTPageOpaque opaque; @@ -1236,7 +1236,7 @@ _bt_step(IndexScanDesc scan, Buffer * bufP, ScanDirection dir) * succeeded, we return true; otherwise, we return false. */ static bool -_bt_twostep(IndexScanDesc scan, Buffer * bufP, ScanDirection dir) +_bt_twostep(IndexScanDesc scan, Buffer *bufP, ScanDirection dir) { Page page; BTPageOpaque opaque; diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index fae0fc27dab..5cfc12e8ccf 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -5,7 +5,7 @@ * * * IDENTIFICATION - * $Id: nbtsort.c,v 1.21 1997/09/08 02:20:58 momjian Exp $ + * $Id: nbtsort.c,v 1.22 1997/09/08 20:54:28 momjian Exp $ * * NOTES * @@ -72,7 +72,7 @@ extern int ShowExecutorStats; static BTItem _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags); static BTItem _bt_minitem(Page opage, BlockNumber oblkno, int atend); static void *_bt_pagestate(Relation index, int flags, int level, bool doupper); -static void _bt_uppershutdown(Relation index, BTPageState * state); +static void _bt_uppershutdown(Relation index, BTPageState *state); /* * turn on debugging output. @@ -113,7 +113,7 @@ typedef struct short bttb_ntup; /* number of tuples in this block */ short bttb_eor; /* End-Of-Run marker */ char bttb_data[TAPEBLCKSZ - 2 * sizeof(double)]; -} BTTapeBlock; +} BTTapeBlock; /* * this structure holds the bookkeeping for a simple balanced multiway @@ -129,7 +129,7 @@ typedef struct BTTapeBlock **bts_itape; /* input tape blocks */ BTTapeBlock **bts_otape; /* output tape blocks */ bool isunique; -} BTSpool; +} BTSpool; /*------------------------------------------------------------------------- * sorting comparison routine - returns {-1,0,1} depending on whether @@ -154,14 +154,14 @@ typedef struct Datum *btsk_datum; char *btsk_nulls; BTItem btsk_item; -} BTSortKey; +} BTSortKey; static Relation _bt_sortrel; static int _bt_nattr; static BTSpool *_bt_inspool; static void -_bt_isortcmpinit(Relation index, BTSpool * spool) +_bt_isortcmpinit(Relation index, BTSpool *spool) { _bt_sortrel = index; _bt_inspool = spool; @@ -169,7 +169,7 @@ _bt_isortcmpinit(Relation index, BTSpool * spool) } static int -_bt_isortcmp(BTSortKey * k1, BTSortKey * k2) +_bt_isortcmp(BTSortKey *k1, BTSortKey *k2) { Datum *k1_datum = k1->btsk_datum; Datum *k2_datum = k2->btsk_datum; @@ -218,7 +218,7 @@ _bt_isortcmp(BTSortKey * k1, BTSortKey * k2) } static void -_bt_setsortkey(Relation index, BTItem bti, BTSortKey * sk) +_bt_setsortkey(Relation index, BTItem bti, BTSortKey *sk) { sk->btsk_item = (BTItem) NULL; sk->btsk_datum = (Datum *) NULL; @@ -262,7 +262,7 @@ typedef struct { int btpqe_tape; /* tape identifier */ BTSortKey btpqe_item; /* pointer to BTItem in tape buffer */ -} BTPriQueueElem; +} BTPriQueueElem; #define MAXELEM MAXTAPES typedef struct @@ -270,14 +270,14 @@ typedef struct int btpq_nelem; BTPriQueueElem btpq_queue[MAXELEM]; Relation btpq_rel; -} BTPriQueue; +} BTPriQueue; /* be sure to call _bt_isortcmpinit first */ #define GREATER(a, b) \ (_bt_isortcmp(&((a)->btpqe_item), &((b)->btpqe_item)) > 0) static void -_bt_pqsift(BTPriQueue * q, int parent) +_bt_pqsift(BTPriQueue *q, int parent) { int child; BTPriQueueElem e; @@ -308,7 +308,7 @@ _bt_pqsift(BTPriQueue * q, int parent) } static int -_bt_pqnext(BTPriQueue * q, BTPriQueueElem * e) +_bt_pqnext(BTPriQueue *q, BTPriQueueElem *e) { if (q->btpq_nelem < 1) { /* already empty */ @@ -326,7 +326,7 @@ _bt_pqnext(BTPriQueue * q, BTPriQueueElem * e) } static void -_bt_pqadd(BTPriQueue * q, BTPriQueueElem * e) +_bt_pqadd(BTPriQueue *q, BTPriQueueElem *e) { int child, parent; @@ -376,7 +376,7 @@ _bt_pqadd(BTPriQueue * q, BTPriQueueElem * e) * empty.) */ static void -_bt_tapereset(BTTapeBlock * tape) +_bt_tapereset(BTTapeBlock *tape) { tape->bttb_eor = 0; tape->bttb_top = 0; @@ -387,7 +387,7 @@ _bt_tapereset(BTTapeBlock * tape) * rewind the physical tape file. */ static void -_bt_taperewind(BTTapeBlock * tape) +_bt_taperewind(BTTapeBlock *tape) { FileSeek(tape->bttb_fd, 0, SEEK_SET); } @@ -402,7 +402,7 @@ _bt_taperewind(BTTapeBlock * tape) * least you don't have to delete and reinsert the directory entries. */ static void -_bt_tapeclear(BTTapeBlock * tape) +_bt_tapeclear(BTTapeBlock *tape) { /* blow away the contents of the old file */ _bt_taperewind(tape); @@ -444,7 +444,7 @@ _bt_tapecreate(char *fname) * destroy the BTTapeBlock structure and its physical tape file. */ static void -_bt_tapedestroy(BTTapeBlock * tape) +_bt_tapedestroy(BTTapeBlock *tape) { FileUnlink(tape->bttb_fd); pfree((void *) tape); @@ -454,7 +454,7 @@ _bt_tapedestroy(BTTapeBlock * tape) * flush the tape block to the file, marking End-Of-Run if requested. */ static void -_bt_tapewrite(BTTapeBlock * tape, int eor) +_bt_tapewrite(BTTapeBlock *tape, int eor) { tape->bttb_eor = eor; FileWrite(tape->bttb_fd, (char *) tape, TAPEBLCKSZ); @@ -472,7 +472,7 @@ _bt_tapewrite(BTTapeBlock * tape, int eor) * - 1 if a valid block was read */ static int -_bt_taperead(BTTapeBlock * tape) +_bt_taperead(BTTapeBlock *tape) { int fd; int nread; @@ -511,7 +511,7 @@ _bt_taperead(BTTapeBlock * tape) * - sets 'pos' to the current position within the block. */ static BTItem -_bt_tapenext(BTTapeBlock * tape, char **pos) +_bt_tapenext(BTTapeBlock *tape, char **pos) { Size itemsz; BTItem bti; @@ -520,7 +520,7 @@ _bt_tapenext(BTTapeBlock * tape, char **pos) { return ((BTItem) NULL); } - bti = (BTItem) * pos; + bti = (BTItem) *pos; itemsz = BTITEMSZ(bti); *pos += DOUBLEALIGN(itemsz); return (bti); @@ -538,7 +538,7 @@ _bt_tapenext(BTTapeBlock * tape, char **pos) * the beginning of free space. */ static void -_bt_tapeadd(BTTapeBlock * tape, BTItem item, int itemsz) +_bt_tapeadd(BTTapeBlock *tape, BTItem item, int itemsz) { memcpy(tape->bttb_data + tape->bttb_top, item, itemsz); ++tape->bttb_ntup; @@ -615,7 +615,7 @@ _bt_spooldestroy(void *spool) * flush out any dirty output tape blocks */ static void -_bt_spoolflush(BTSpool * btspool) +_bt_spoolflush(BTSpool *btspool) { int i; @@ -635,7 +635,7 @@ _bt_spoolflush(BTSpool * btspool) * output tapes. */ static void -_bt_spoolswap(BTSpool * btspool) +_bt_spoolswap(BTSpool *btspool) { File tmpfd; BTTapeBlock *itape; @@ -800,7 +800,7 @@ _bt_spool(Relation index, BTItem btitem, void *spool) * allocate a new, clean btree page, not linked to any siblings. */ static void -_bt_blnewpage(Relation index, Buffer * buf, Page * page, int flags) +_bt_blnewpage(Relation index, Buffer *buf, Page * page, int flags) { BTPageOpaque opaque; @@ -1107,7 +1107,7 @@ _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags) } static void -_bt_uppershutdown(Relation index, BTPageState * state) +_bt_uppershutdown(Relation index, BTPageState *state) { BTPageState *s; BlockNumber blkno; @@ -1158,7 +1158,7 @@ _bt_uppershutdown(Relation index, BTPageState * state) * XXX three nested loops? gross. cut me up into smaller routines. */ static void -_bt_merge(Relation index, BTSpool * btspool) +_bt_merge(Relation index, BTSpool *btspool) { BTPageState *state; BTPriQueue q; diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c index 5f1d4846f6d..b2c967e5852 100644 --- a/src/backend/access/rtree/rtproc.c +++ b/src/backend/access/rtree/rtproc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.9 1997/09/08 02:21:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.10 1997/09/08 20:54:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,7 +23,8 @@ #endif BOX -* rt_box_union(BOX * a, BOX * b) + * +rt_box_union(BOX *a, BOX *b) { BOX *n; @@ -39,7 +40,7 @@ BOX } BOX * -rt_box_inter(BOX * a, BOX * b) +rt_box_inter(BOX *a, BOX *b) { BOX *n; @@ -61,7 +62,7 @@ rt_box_inter(BOX * a, BOX * b) } void -rt_box_size(BOX * a, float *size) +rt_box_size(BOX *a, float *size) { if (a == (BOX *) NULL || a->high.x <= a->low.x || a->high.y <= a->low.y) *size = 0.0; @@ -80,7 +81,7 @@ rt_box_size(BOX * a, float *size) * have a special return type for big boxes. */ void -rt_bigbox_size(BOX * a, float *size) +rt_bigbox_size(BOX *a, float *size) { rt_box_size(a, size); } diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c index 8b1aa533e84..2d18f20540f 100644 --- a/src/backend/access/rtree/rtree.c +++ b/src/backend/access/rtree/rtree.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.15 1997/09/08 02:21:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.16 1997/09/08 20:54:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -78,7 +78,7 @@ void rtbuild(Relation heap, Relation index, int natts, - AttrNumber * attnum, + AttrNumber *attnum, IndexStrategy istrat, uint16 pcount, Datum * params, diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c index 03b82872fd6..9d5724fad14 100644 --- a/src/backend/access/transam/transam.c +++ b/src/backend/access/transam/transam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.11 1997/09/08 02:21:14 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.12 1997/09/08 20:54:36 momjian Exp $ * * NOTES * This file contains the high level access-method interface to the @@ -273,8 +273,8 @@ TransactionLogUpdate(TransactionId transactionId, /* trans id to update */ */ AbsoluteTime /* commit time of transaction id */ -TransactionIdGetCommitTime(TransactionId transactionId) /* transaction id to - * test */ +TransactionIdGetCommitTime(TransactionId transactionId) /* transaction id to + * test */ { BlockNumber blockNumber; AbsoluteTime commitTime; /* commit time */ diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c index acdfe93ea90..15645d61b19 100644 --- a/src/backend/access/transam/transsup.c +++ b/src/backend/access/transam/transsup.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.11 1997/09/08 02:21:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.12 1997/09/08 20:54:37 momjian Exp $ * * NOTES * This file contains support functions for the high @@ -61,7 +61,7 @@ void TransComputeBlockNumber(Relation relation, /* relation to test */ TransactionId transactionId, /* transaction id to * test */ - BlockNumber * blockNumberOutP) + BlockNumber *blockNumberOutP) { long itemsPerBlock = 0; |