summaryrefslogtreecommitdiff
path: root/src/include/access
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/access')
-rw-r--r--src/include/access/genam.h20
-rw-r--r--src/include/access/gist.h9
-rw-r--r--src/include/access/gistscan.h3
-rw-r--r--src/include/access/giststrat.h3
-rw-r--r--src/include/access/hash.h29
-rw-r--r--src/include/access/heapam.h25
-rw-r--r--src/include/access/hio.h5
-rw-r--r--src/include/access/iqual.h5
-rw-r--r--src/include/access/istrat.h17
-rw-r--r--src/include/access/itup.h11
-rw-r--r--src/include/access/nbtree.h35
-rw-r--r--src/include/access/rtree.h17
-rw-r--r--src/include/access/rtstrat.h5
-rw-r--r--src/include/access/skey.h5
-rw-r--r--src/include/access/transam.h11
-rw-r--r--src/include/access/tupdesc.h5
16 files changed, 73 insertions, 132 deletions
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index 6bf54c84df..79aa1fc89f 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: genam.h,v 1.10 1997/09/08 21:50:34 momjian Exp $
+ * $Id: genam.h,v 1.11 1998/01/24 22:47:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -25,31 +25,25 @@
extern Relation index_open(Oid relationId);
extern Relation index_openr(char *relationName);
extern void index_close(Relation relation);
-extern InsertIndexResult
-index_insert(Relation relation,
+extern InsertIndexResult index_insert(Relation relation,
Datum *datum, char *nulls,
ItemPointer heap_t_ctid,
Relation heapRel);
extern void index_delete(Relation relation, ItemPointer indexItem);
-extern IndexScanDesc
-index_beginscan(Relation relation, bool scanFromEnd,
+extern IndexScanDesc index_beginscan(Relation relation, bool scanFromEnd,
uint16 numberOfKeys, ScanKey key);
extern void index_rescan(IndexScanDesc scan, bool scanFromEnd, ScanKey key);
extern void index_endscan(IndexScanDesc scan);
-extern RetrieveIndexResult
-index_getnext(IndexScanDesc scan,
+extern RetrieveIndexResult index_getnext(IndexScanDesc scan,
ScanDirection direction);
-extern RegProcedure
-index_getprocid(Relation irel, AttrNumber attnum,
+extern RegProcedure index_getprocid(Relation irel, AttrNumber attnum,
uint16 procnum);
-extern Datum
-GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc,
+extern Datum GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc,
int attOff, AttrNumber attrNums[], FuncIndexInfo *fInfo,
bool *attNull, Buffer buffer);
/* in genam.c */
-extern IndexScanDesc
-RelationGetIndexScan(Relation relation, bool scanFromEnd,
+extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd,
uint16 numberOfKeys, ScanKey key);
extern void IndexScanMarkPosition(IndexScanDesc scan);
extern void IndexScanRestorePosition(IndexScanDesc scan);
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index 15294ce06c..4c665aeaec 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -188,21 +188,18 @@ typedef struct intrange
int flag;
} INTRANGE;
-extern void
-gistbuild(Relation heap,
+extern void gistbuild(Relation heap,
Relation index, int natts,
AttrNumber *attnum, IndexStrategy istrat,
uint16 pint, Datum *params,
FuncIndexInfo *finfo,
PredInfo *predInfo);
-extern InsertIndexResult
-gistinsert(Relation r, Datum *datum,
+extern InsertIndexResult gistinsert(Relation r, Datum *datum,
char *nulls, ItemPointer ht_ctid, Relation heapRel);
extern void _gistdump(Relation r);
extern void gistfreestack(GISTSTACK *s);
extern void initGISTstate(GISTSTATE *giststate, Relation index);
-extern void
-gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr,
+extern void gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr,
Relation r, Page pg, OffsetNumber o, int b, bool l);
extern StrategyNumber RelationGetGISTStrategy(Relation, AttrNumber, RegProcedure);
diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h
index 071238bd17..e38b26d990 100644
--- a/src/include/access/gistscan.h
+++ b/src/include/access/gistscan.h
@@ -16,8 +16,7 @@
#include <storage/block.h>
#include <utils/rel.h>
-extern IndexScanDesc
-gistbeginscan(Relation r, bool fromEnd,
+extern IndexScanDesc gistbeginscan(Relation r, bool fromEnd,
uint16 nkeys, ScanKey key);
extern void gistrescan(IndexScanDesc s, bool fromEnd, ScanKey key);
extern void gistmarkpos(IndexScanDesc s);
diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h
index 1007dd3ec2..f5e6e45d77 100644
--- a/src/include/access/giststrat.h
+++ b/src/include/access/giststrat.h
@@ -15,8 +15,7 @@
#include <access/strat.h>
#include <utils/rel.h>
-extern StrategyNumber
-RelationGetGISTStrategy(Relation r,
+extern StrategyNumber RelationGetGISTStrategy(Relation r,
AttrNumber attnum, RegProcedure proc);
#endif /* GISTSTRAT_H */
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 43d188245d..268edd82ea 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: hash.h,v 1.11 1997/09/08 21:50:44 momjian Exp $
+ * $Id: hash.h,v 1.12 1998/01/24 22:47:55 momjian Exp $
*
* NOTES
* modeled after Margo Seltzer's hash implementation for unix.
@@ -248,16 +248,13 @@ typedef HashItemData *HashItem;
/* public routines */
-extern void
-hashbuild(Relation heap, Relation index, int natts,
+extern void hashbuild(Relation heap, Relation index, int natts,
AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo);
-extern InsertIndexResult
-hashinsert(Relation rel, Datum *datum, char *nulls,
+extern InsertIndexResult hashinsert(Relation rel, Datum *datum, char *nulls,
ItemPointer ht_ctid, Relation heapRel);
extern char *hashgettuple(IndexScanDesc scan, ScanDirection dir);
-extern char *
-hashbeginscan(Relation rel, bool fromEnd, uint16 keysz,
+extern char * hashbeginscan(Relation rel, bool fromEnd, uint16 keysz,
ScanKey scankey);
extern void hashrescan(IndexScanDesc scan, bool fromEnd, ScanKey scankey);
extern void hashendscan(IndexScanDesc scan);
@@ -288,11 +285,9 @@ extern InsertIndexResult _hash_doinsert(Relation rel, HashItem hitem);
/* hashovfl.c */
extern Buffer _hash_addovflpage(Relation rel, Buffer *metabufp, Buffer buf);
extern Buffer _hash_freeovflpage(Relation rel, Buffer ovflbuf);
-extern int32
-_hash_initbitmap(Relation rel, HashMetaPage metap, int32 pnum,
+extern int32 _hash_initbitmap(Relation rel, HashMetaPage metap, int32 pnum,
int32 nbits, int32 ndx);
-extern void
-_hash_squeezebucket(Relation rel, HashMetaPage metap,
+extern void _hash_squeezebucket(Relation rel, HashMetaPage metap,
Bucket bucket);
@@ -302,8 +297,7 @@ extern Buffer _hash_getbuf(Relation rel, BlockNumber blkno, int access);
extern void _hash_relbuf(Relation rel, Buffer buf, int access);
extern void _hash_wrtbuf(Relation rel, Buffer buf);
extern void _hash_wrtnorelbuf(Relation rel, Buffer buf);
-extern Page
-_hash_chgbufaccess(Relation rel, Buffer *bufp, int from_access,
+extern Page _hash_chgbufaccess(Relation rel, Buffer *bufp, int from_access,
int to_access);
extern void _hash_pageinit(Page page, Size size);
extern void _hash_pagedel(Relation rel, ItemPointer tid);
@@ -317,19 +311,16 @@ extern void _hash_adjscans(Relation rel, ItemPointer tid);
/* hashsearch.c */
-extern void
-_hash_search(Relation rel, int keysz, ScanKey scankey,
+extern void _hash_search(Relation rel, int keysz, ScanKey scankey,
Buffer *bufP, HashMetaPage metap);
extern RetrieveIndexResult _hash_next(IndexScanDesc scan, ScanDirection dir);
extern RetrieveIndexResult _hash_first(IndexScanDesc scan, ScanDirection dir);
-extern bool
-_hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir,
+extern bool _hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir,
Buffer metabuf);
/* hashutil.c */
-extern ScanKey
-_hash_mkscankey(Relation rel, IndexTuple itup,
+extern ScanKey _hash_mkscankey(Relation rel, IndexTuple itup,
HashMetaPage metap);
extern void _hash_freeskey(ScanKey skey);
extern bool _hash_checkqual(IndexScanDesc scan, IndexTuple itup);
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index cb9a0a889f..9aa7293931 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -1,4 +1,4 @@
-/*-------------------------------------------------------------------------
+ *-------------------------------------------------------------------------
*
* heapam.h--
* POSTGRES heap access method definitions.
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: heapam.h,v 1.22 1997/11/20 23:23:31 momjian Exp $
+ * $Id: heapam.h,v 1.23 1998/01/24 22:47:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -121,26 +121,22 @@ extern void doinsert(Relation relation, HeapTuple tup);
extern Relation heap_open(Oid relationId);
extern Relation heap_openr(char *relationName);
extern void heap_close(Relation relation);
-extern HeapScanDesc
-heap_beginscan(Relation relation, int atend,
+extern HeapScanDesc heap_beginscan(Relation relation, int atend,
bool seeself, unsigned nkeys, ScanKey key);
extern void heap_rescan(HeapScanDesc sdesc, bool scanFromEnd, ScanKey key);
extern void heap_endscan(HeapScanDesc sdesc);
extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw, Buffer *b);
-extern HeapTuple
-heap_fetch(Relation relation, bool seeself, ItemPointer tid, Buffer *b);
+extern HeapTuple heap_fetch(Relation relation, bool seeself, ItemPointer tid, Buffer *b);
extern Oid heap_insert(Relation relation, HeapTuple tup);
extern int heap_delete(Relation relation, ItemPointer tid);
-extern int
-heap_replace(Relation relation, ItemPointer otid,
+extern int heap_replace(Relation relation, ItemPointer otid,
HeapTuple tup);
extern void heap_markpos(HeapScanDesc sdesc);
extern void heap_restrpos(HeapScanDesc sdesc);
/* in common/heaptuple.c */
extern Size ComputeDataSize(TupleDesc tupleDesc, Datum value[], char nulls[]);
-extern void
-DataFill(char *data, TupleDesc tupleDesc,
+extern void DataFill(char *data, TupleDesc tupleDesc,
Datum value[], char nulls[], uint16 *infomask,
bits8 *bit);
extern int heap_attisnull(HeapTuple tup, int attnum);
@@ -150,11 +146,9 @@ extern Datum heap_getsysattr(HeapTuple tup, Buffer b, int attnum);
extern Datum fastgetattr(HeapTuple tup, int attnum,
TupleDesc att, bool *isnull);
extern HeapTuple heap_copytuple(HeapTuple tuple);
-extern HeapTuple
-heap_formtuple(TupleDesc tupleDescriptor,
+extern HeapTuple heap_formtuple(TupleDesc tupleDescriptor,
Datum value[], char nulls[]);
-extern HeapTuple
-heap_modifytuple(HeapTuple tuple, Buffer buffer,
+extern HeapTuple heap_modifytuple(HeapTuple tuple, Buffer buffer,
Relation relation, Datum replValue[], char replNull[], char repl[]);
HeapTuple heap_addheader(uint32 natts, int structlen, char *structure);
@@ -163,8 +157,7 @@ extern void PrintHeapAccessStatistics(HeapAccessStatistics stats);
extern void initam(void);
/* hio.c */
-extern void
-RelationPutHeapTuple(Relation relation, BlockNumber blockIndex,
+extern void RelationPutHeapTuple(Relation relation, BlockNumber blockIndex,
HeapTuple tuple);
extern void RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple);
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index e4bd0404f6..0f7c40e1ed 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: hio.h,v 1.5 1997/09/08 02:34:11 momjian Exp $
+ * $Id: hio.h,v 1.6 1998/01/24 22:48:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,8 +17,7 @@
#include <utils/rel.h>
-extern void
-RelationPutHeapTuple(Relation relation, BlockNumber blockIndex,
+extern void RelationPutHeapTuple(Relation relation, BlockNumber blockIndex,
HeapTuple tuple);
extern void RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple);
diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h
index eb9a68193f..3cc1700f9c 100644
--- a/src/include/access/iqual.h
+++ b/src/include/access/iqual.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: iqual.h,v 1.7 1997/09/08 21:50:48 momjian Exp $
+ * $Id: iqual.h,v 1.8 1998/01/24 22:48:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,8 +24,7 @@
extern int NIndexTupleProcessed;
-extern bool
-index_keytest(IndexTuple tuple, TupleDesc tupdesc,
+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 55363a268d..f2dcf2f554 100644
--- a/src/include/access/istrat.h
+++ b/src/include/access/istrat.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: istrat.h,v 1.8 1997/09/08 21:50:50 momjian Exp $
+ * $Id: istrat.h,v 1.9 1998/01/24 22:48:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -47,23 +47,18 @@
*/
#define IndexStrategyIsValid(s) PointerIsValid(s)
-extern StrategyMap
-IndexStrategyGetStrategyMap(IndexStrategy indexStrategy,
+extern StrategyMap IndexStrategyGetStrategyMap(IndexStrategy indexStrategy,
StrategyNumber maxStrategyNum, AttrNumber attrNum);
-extern Size
-AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber,
+extern Size AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber,
StrategyNumber maxStrategyNumber);
-extern StrategyNumber
-RelationGetStrategy(Relation relation,
+extern StrategyNumber RelationGetStrategy(Relation relation,
AttrNumber attributeNumber, StrategyEvaluation evaluation,
RegProcedure procedure);
-extern bool
-RelationInvokeStrategy(Relation relation,
+extern bool RelationInvokeStrategy(Relation relation,
StrategyEvaluation evaluation, AttrNumber attributeNumber,
StrategyNumber strategy, Datum left, Datum right);
-extern void
-IndexSupportInitialize(IndexStrategy indexStrategy,
+extern void IndexSupportInitialize(IndexStrategy indexStrategy,
RegProcedure *indexSupport, Oid indexObjectId,
Oid accessMethodObjectId, StrategyNumber maxStrategyNumber,
StrategyNumber maxSupportNumber, AttrNumber maxAttributeNumber);
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index a1581133bf..362dcce1fc 100644
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: itup.h,v 1.8 1997/09/08 21:50:53 momjian Exp $
+ * $Id: itup.h,v 1.9 1998/01/24 22:48:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -89,14 +89,11 @@ typedef struct PredInfo
/* indextuple.h */
-extern IndexTuple
-index_formtuple(TupleDesc tupleDescriptor,
+extern IndexTuple index_formtuple(TupleDesc tupleDescriptor,
Datum value[], char null[]);
-extern Datum
-index_getattr(IndexTuple tuple, AttrNumber attNum,
+extern Datum index_getattr(IndexTuple tuple, AttrNumber attNum,
TupleDesc tupDesc, bool *isNullOutP);
-extern RetrieveIndexResult
-FormRetrieveIndexResult(ItemPointer indexItemPointer,
+extern RetrieveIndexResult FormRetrieveIndexResult(ItemPointer indexItemPointer,
ItemPointer heapItemPointer);
extern void CopyIndexTuple(IndexTuple source, IndexTuple *target);
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index 8338881961..8370422efc 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nbtree.h,v 1.18 1997/09/08 21:50:55 momjian Exp $
+ * $Id: nbtree.h,v 1.19 1998/01/24 22:48:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -213,13 +213,11 @@ typedef struct BTPageState
/*
* prototypes for functions in nbtinsert.c
*/
-extern InsertIndexResult
-_bt_doinsert(Relation rel, BTItem btitem,
+extern InsertIndexResult _bt_doinsert(Relation rel, BTItem btitem,
bool index_is_unique, Relation heapRel);
/* default is to allow duplicates */
-extern bool
-_bt_itemcmp(Relation rel, Size keysz, BTItem item1, BTItem item2,
+extern bool _bt_itemcmp(Relation rel, Size keysz, BTItem item1, BTItem item2,
StrategyNumber strat);
/*
@@ -241,16 +239,13 @@ extern void _bt_pagedel(Relation rel, ItemPointer tid);
*/
extern bool BuildingBtree; /* in nbtree.c */
-extern void
-btbuild(Relation heap, Relation index, int natts,
+extern void btbuild(Relation heap, Relation index, int natts,
AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo);
-extern InsertIndexResult
-btinsert(Relation rel, Datum *datum, char *nulls,
+extern InsertIndexResult btinsert(Relation rel, Datum *datum, char *nulls,
ItemPointer ht_ctid, Relation heapRel);
extern char *btgettuple(IndexScanDesc scan, ScanDirection dir);
-extern char *
-btbeginscan(Relation rel, bool fromEnd, uint16 keysz,
+extern char * btbeginscan(Relation rel, bool fromEnd, uint16 keysz,
ScanKey scankey);
extern void btrescan(IndexScanDesc scan, bool fromEnd, ScanKey scankey);
@@ -270,17 +265,13 @@ extern void _bt_adjscans(Relation rel, ItemPointer tid, int op);
/*
* prototypes for functions in nbtsearch.c
*/
-extern BTStack
-_bt_search(Relation rel, int keysz, ScanKey scankey,
+extern BTStack _bt_search(Relation rel, int keysz, ScanKey scankey,
Buffer *bufP);
-extern Buffer
-_bt_moveright(Relation rel, Buffer buf, int keysz,
+extern Buffer _bt_moveright(Relation rel, Buffer buf, int keysz,
ScanKey scankey, int access);
-extern bool
-_bt_skeycmp(Relation rel, Size keysz, ScanKey scankey,
+extern bool _bt_skeycmp(Relation rel, Size keysz, ScanKey scankey,
Page page, ItemId itemid, StrategyNumber strat);
-extern OffsetNumber
-_bt_binsrch(Relation rel, Buffer buf, int keysz,
+extern OffsetNumber _bt_binsrch(Relation rel, Buffer buf, int keysz,
ScanKey scankey, int srchtype);
extern RetrieveIndexResult _bt_next(IndexScanDesc scan, ScanDirection dir);
extern RetrieveIndexResult _bt_first(IndexScanDesc scan, ScanDirection dir);
@@ -289,11 +280,9 @@ extern bool _bt_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir);
/*
* prototypes for functions in nbtstrat.c
*/
-extern StrategyNumber
-_bt_getstrat(Relation rel, AttrNumber attno,
+extern StrategyNumber _bt_getstrat(Relation rel, AttrNumber attno,
RegProcedure proc);
-extern bool
-_bt_invokestrat(Relation rel, AttrNumber attno,
+extern bool _bt_invokestrat(Relation rel, AttrNumber attno,
StrategyNumber strat, Datum left, Datum right);
/*
diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h
index a6998aff4f..2af1c90a8c 100644
--- a/src/include/access/rtree.h
+++ b/src/include/access/rtree.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: rtree.h,v 1.10 1997/09/08 21:50:58 momjian Exp $
+ * $Id: rtree.h,v 1.11 1998/01/24 22:48:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -114,34 +114,29 @@ extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir);
* RTree code.
* Defined in access/index-rtree/
*/
-extern InsertIndexResult
-rtinsert(Relation r, Datum *datum, char *nulls,
+extern InsertIndexResult rtinsert(Relation r, Datum *datum, char *nulls,
ItemPointer ht_ctid, Relation heapRel);
extern char *rtdelete(Relation r, ItemPointer tid);
extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir);
-extern IndexScanDesc
-rtbeginscan(Relation r, bool fromEnd, uint16 nkeys,
+extern IndexScanDesc rtbeginscan(Relation r, bool fromEnd, uint16 nkeys,
ScanKey key);
extern void rtendscan(IndexScanDesc s);
extern void rtmarkpos(IndexScanDesc s);
extern void rtrestrpos(IndexScanDesc s);
extern void rtrescan(IndexScanDesc s, bool fromEnd, ScanKey key);
-extern void
-rtbuild(Relation heap, Relation index, int natts,
+extern void rtbuild(Relation heap, Relation index, int natts,
AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo);
extern void _rtdump(Relation r);
/* rtscan.c */
-extern void
-rtadjscans(Relation r, int op, BlockNumber blkno,
+extern void rtadjscans(Relation r, int op, BlockNumber blkno,
OffsetNumber offnum);
/* rtstrat.h */
-extern RegProcedure
-RTMapOperator(Relation r, AttrNumber attnum,
+extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum,
RegProcedure proc);
#endif /* RTREE_H */
diff --git a/src/include/access/rtstrat.h b/src/include/access/rtstrat.h
index 72d4ceb825..edb6b32db5 100644
--- a/src/include/access/rtstrat.h
+++ b/src/include/access/rtstrat.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: rtstrat.h,v 1.5 1997/11/26 01:12:08 momjian Exp $
+ * $Id: rtstrat.h,v 1.6 1998/01/24 22:48:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,8 +16,7 @@
#include <utils/rel.h>
#include <access/attnum.h>
-extern RegProcedure
-RTMapOperator(Relation r, AttrNumber attnum,
+extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum,
RegProcedure proc);
#endif /* RTSTRAT_H */
diff --git a/src/include/access/skey.h b/src/include/access/skey.h
index 4cbf18197f..e51b521518 100644
--- a/src/include/access/skey.h
+++ b/src/include/access/skey.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: skey.h,v 1.7 1998/01/15 19:46:18 pgsql Exp $
+ * $Id: skey.h,v 1.8 1998/01/24 22:48:10 momjian Exp $
*
*
* Note:
@@ -46,8 +46,7 @@ typedef ScanKeyData *ScanKey;
* prototypes for functions in access/common/scankey.c
*/
extern void ScanKeyEntrySetIllegal(ScanKey entry);
-extern void
-ScanKeyEntryInitialize(ScanKey entry, bits16 flags,
+extern void ScanKeyEntryInitialize(ScanKey entry, bits16 flags,
AttrNumber attributeNumber, RegProcedure procedure, Datum argument);
#endif /* SKEY_H */
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index fb4a6cd724..7f8417ca0f 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: transam.h,v 1.12 1997/11/02 15:26:44 vadim Exp $
+ * $Id: transam.h,v 1.13 1998/01/24 22:48:11 momjian Exp $
*
* NOTES
* Transaction System Version 101 now support proper oid
@@ -130,14 +130,11 @@ extern void TransactionIdAbort(TransactionId transactionId);
/* in transam/transsup.c */
extern void AmiTransactionOverride(bool flag);
-extern void
-TransComputeBlockNumber(Relation relation,
+extern void TransComputeBlockNumber(Relation relation,
TransactionId transactionId, BlockNumber *blockNumberOutP);
-extern XidStatus
-TransBlockNumberGetXidStatus(Relation relation,
+extern XidStatus TransBlockNumberGetXidStatus(Relation relation,
BlockNumber blockNumber, TransactionId xid, bool *failP);
-extern void
-TransBlockNumberSetXidStatus(Relation relation,
+extern void TransBlockNumberSetXidStatus(Relation relation,
BlockNumber blockNumber, TransactionId xid, XidStatus xstatus,
bool *failP);
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index 3b13dcde91..812fee562c 100644
--- a/src/include/access/tupdesc.h
+++ b/src/include/access/tupdesc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tupdesc.h,v 1.12 1997/09/08 21:51:04 momjian Exp $
+ * $Id: tupdesc.h,v 1.13 1998/01/24 22:48:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -65,8 +65,7 @@ extern TupleDesc CreateTupleDescCopyConstr(TupleDesc tupdesc);
extern void FreeTupleDesc(TupleDesc tupdesc);
-extern bool
-TupleDescInitEntry(TupleDesc desc,
+extern bool TupleDescInitEntry(TupleDesc desc,
AttrNumber attributeNumber,
char *attributeName,
char *typeName,
View Lorry Controller Status