Skip to content

Commit 7229513

Browse files
bmomjianbmomjian
committed
Fix prototypes so they don't look like function definitions.
1 parent 27317a0 commit 7229513

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+289
-499
lines changed

‎src/include/access/genam.h

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: genam.h,v 1.10 1997/09/08 21:50:34 momjian Exp $
9+
* $Id: genam.h,v 1.11 1998/01/24 22:47:48 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -25,31 +25,25 @@
2525
extern Relation index_open(Oid relationId);
2626
extern Relation index_openr(char *relationName);
2727
extern void index_close(Relation relation);
28-
extern InsertIndexResult
29-
index_insert(Relation relation,
28+
extern InsertIndexResult index_insert(Relation relation,
3029
Datum *datum, char *nulls,
3130
ItemPointer heap_t_ctid,
3231
Relation heapRel);
3332
extern void index_delete(Relation relation, ItemPointer indexItem);
34-
extern IndexScanDesc
35-
index_beginscan(Relation relation, bool scanFromEnd,
33+
extern IndexScanDesc index_beginscan(Relation relation, bool scanFromEnd,
3634
uint16 numberOfKeys, ScanKey key);
3735
extern void index_rescan(IndexScanDesc scan, bool scanFromEnd, ScanKey key);
3836
extern void index_endscan(IndexScanDesc scan);
39-
extern RetrieveIndexResult
40-
index_getnext(IndexScanDesc scan,
37+
extern RetrieveIndexResult index_getnext(IndexScanDesc scan,
4138
ScanDirection direction);
42-
extern RegProcedure
43-
index_getprocid(Relation irel, AttrNumber attnum,
39+
extern RegProcedure index_getprocid(Relation irel, AttrNumber attnum,
4440
uint16 procnum);
45-
extern Datum
46-
GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc,
41+
extern Datum GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc,
4742
int attOff, AttrNumber attrNums[], FuncIndexInfo *fInfo,
4843
bool *attNull, Buffer buffer);
4944

5045
/* in genam.c */
51-
extern IndexScanDesc
52-
RelationGetIndexScan(Relation relation, bool scanFromEnd,
46+
extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd,
5347
uint16 numberOfKeys, ScanKey key);
5448
extern void IndexScanMarkPosition(IndexScanDesc scan);
5549
extern void IndexScanRestorePosition(IndexScanDesc scan);

‎src/include/access/gist.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,21 +188,18 @@ typedef struct intrange
188188
int flag;
189189
} INTRANGE;
190190

191-
extern void
192-
gistbuild(Relation heap,
191+
extern void gistbuild(Relation heap,
193192
Relation index, int natts,
194193
AttrNumber *attnum, IndexStrategy istrat,
195194
uint16 pint, Datum *params,
196195
FuncIndexInfo *finfo,
197196
PredInfo *predInfo);
198-
extern InsertIndexResult
199-
gistinsert(Relation r, Datum *datum,
197+
extern InsertIndexResult gistinsert(Relation r, Datum *datum,
200198
char *nulls, ItemPointer ht_ctid, Relation heapRel);
201199
extern void _gistdump(Relation r);
202200
extern void gistfreestack(GISTSTACK *s);
203201
extern void initGISTstate(GISTSTATE *giststate, Relation index);
204-
extern void
205-
gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr,
202+
extern void gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr,
206203
Relation r, Page pg, OffsetNumber o, int b, bool l);
207204
extern StrategyNumber RelationGetGISTStrategy(Relation, AttrNumber, RegProcedure);
208205

‎src/include/access/gistscan.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
#include <storage/block.h>
1717
#include <utils/rel.h>
1818

19-
extern IndexScanDesc
20-
gistbeginscan(Relation r, bool fromEnd,
19+
extern IndexScanDesc gistbeginscan(Relation r, bool fromEnd,
2120
uint16 nkeys, ScanKey key);
2221
extern void gistrescan(IndexScanDesc s, bool fromEnd, ScanKey key);
2322
extern void gistmarkpos(IndexScanDesc s);

‎src/include/access/giststrat.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
#include <access/strat.h>
1616
#include <utils/rel.h>
1717

18-
extern StrategyNumber
19-
RelationGetGISTStrategy(Relation r,
18+
extern StrategyNumber RelationGetGISTStrategy(Relation r,
2019
AttrNumber attnum, RegProcedure proc);
2120

2221
#endif /* GISTSTRAT_H */

‎src/include/access/hash.h

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: hash.h,v 1.11 1997/09/08 21:50:44 momjian Exp $
9+
* $Id: hash.h,v 1.12 1998/01/24 22:47:55 momjian Exp $
1010
*
1111
* NOTES
1212
* modeled after Margo Seltzer's hash implementation for unix.
@@ -248,16 +248,13 @@ typedef HashItemData *HashItem;
248248

249249
/* public routines */
250250

251-
extern void
252-
hashbuild(Relation heap, Relation index, int natts,
251+
extern void hashbuild(Relation heap, Relation index, int natts,
253252
AttrNumber *attnum, IndexStrategy istrat, uint16 pcount,
254253
Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo);
255-
extern InsertIndexResult
256-
hashinsert(Relation rel, Datum *datum, char *nulls,
254+
extern InsertIndexResult hashinsert(Relation rel, Datum *datum, char *nulls,
257255
ItemPointer ht_ctid, Relation heapRel);
258256
extern char *hashgettuple(IndexScanDesc scan, ScanDirection dir);
259-
extern char *
260-
hashbeginscan(Relation rel, bool fromEnd, uint16 keysz,
257+
extern char * hashbeginscan(Relation rel, bool fromEnd, uint16 keysz,
261258
ScanKey scankey);
262259
extern void hashrescan(IndexScanDesc scan, bool fromEnd, ScanKey scankey);
263260
extern void hashendscan(IndexScanDesc scan);
@@ -288,11 +285,9 @@ extern InsertIndexResult _hash_doinsert(Relation rel, HashItem hitem);
288285
/* hashovfl.c */
289286
extern Buffer _hash_addovflpage(Relation rel, Buffer *metabufp, Buffer buf);
290287
extern Buffer _hash_freeovflpage(Relation rel, Buffer ovflbuf);
291-
extern int32
292-
_hash_initbitmap(Relation rel, HashMetaPage metap, int32 pnum,
288+
extern int32 _hash_initbitmap(Relation rel, HashMetaPage metap, int32 pnum,
293289
int32 nbits, int32 ndx);
294-
extern void
295-
_hash_squeezebucket(Relation rel, HashMetaPage metap,
290+
extern void _hash_squeezebucket(Relation rel, HashMetaPage metap,
296291
Bucket bucket);
297292

298293

@@ -302,8 +297,7 @@ extern Buffer _hash_getbuf(Relation rel, BlockNumber blkno, int access);
302297
extern void _hash_relbuf(Relation rel, Buffer buf, int access);
303298
extern void _hash_wrtbuf(Relation rel, Buffer buf);
304299
extern void _hash_wrtnorelbuf(Relation rel, Buffer buf);
305-
extern Page
306-
_hash_chgbufaccess(Relation rel, Buffer *bufp, int from_access,
300+
extern Page _hash_chgbufaccess(Relation rel, Buffer *bufp, int from_access,
307301
int to_access);
308302
extern void _hash_pageinit(Page page, Size size);
309303
extern void _hash_pagedel(Relation rel, ItemPointer tid);
@@ -317,19 +311,16 @@ extern void _hash_adjscans(Relation rel, ItemPointer tid);
317311

318312

319313
/* hashsearch.c */
320-
extern void
321-
_hash_search(Relation rel, int keysz, ScanKey scankey,
314+
extern void _hash_search(Relation rel, int keysz, ScanKey scankey,
322315
Buffer *bufP, HashMetaPage metap);
323316
extern RetrieveIndexResult _hash_next(IndexScanDesc scan, ScanDirection dir);
324317
extern RetrieveIndexResult _hash_first(IndexScanDesc scan, ScanDirection dir);
325-
extern bool
326-
_hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir,
318+
extern bool _hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir,
327319
Buffer metabuf);
328320

329321

330322
/* hashutil.c */
331-
extern ScanKey
332-
_hash_mkscankey(Relation rel, IndexTuple itup,
323+
extern ScanKey _hash_mkscankey(Relation rel, IndexTuple itup,
333324
HashMetaPage metap);
334325
extern void _hash_freeskey(ScanKey skey);
335326
extern bool _hash_checkqual(IndexScanDesc scan, IndexTuple itup);

‎src/include/access/heapam.h

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
/*-------------------------------------------------------------------------
1+
*-------------------------------------------------------------------------
22
*
33
* heapam.h--
44
* POSTGRES heap access method definitions.
55
*
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: heapam.h,v 1.22 1997/11/20 23:23:31 momjian Exp $
9+
* $Id: heapam.h,v 1.23 1998/01/24 22:47:59 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -121,26 +121,22 @@ extern void doinsert(Relation relation, HeapTuple tup);
121121
extern Relation heap_open(Oid relationId);
122122
extern Relation heap_openr(char *relationName);
123123
extern void heap_close(Relation relation);
124-
extern HeapScanDesc
125-
heap_beginscan(Relation relation, int atend,
124+
extern HeapScanDesc heap_beginscan(Relation relation, int atend,
126125
bool seeself, unsigned nkeys, ScanKey key);
127126
extern void heap_rescan(HeapScanDesc sdesc, bool scanFromEnd, ScanKey key);
128127
extern void heap_endscan(HeapScanDesc sdesc);
129128
extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw, Buffer *b);
130-
extern HeapTuple
131-
heap_fetch(Relation relation, bool seeself, ItemPointer tid, Buffer *b);
129+
extern HeapTuple heap_fetch(Relation relation, bool seeself, ItemPointer tid, Buffer *b);
132130
extern Oid heap_insert(Relation relation, HeapTuple tup);
133131
extern int heap_delete(Relation relation, ItemPointer tid);
134-
extern int
135-
heap_replace(Relation relation, ItemPointer otid,
132+
extern int heap_replace(Relation relation, ItemPointer otid,
136133
HeapTuple tup);
137134
extern void heap_markpos(HeapScanDesc sdesc);
138135
extern void heap_restrpos(HeapScanDesc sdesc);
139136

140137
/* in common/heaptuple.c */
141138
extern Size ComputeDataSize(TupleDesc tupleDesc, Datum value[], char nulls[]);
142-
extern void
143-
DataFill(char *data, TupleDesc tupleDesc,
139+
extern void DataFill(char *data, TupleDesc tupleDesc,
144140
Datum value[], char nulls[], uint16 *infomask,
145141
bits8 *bit);
146142
extern int heap_attisnull(HeapTuple tup, int attnum);
@@ -150,11 +146,9 @@ extern Datum heap_getsysattr(HeapTuple tup, Buffer b, int attnum);
150146
extern Datum fastgetattr(HeapTuple tup, int attnum,
151147
TupleDesc att, bool *isnull);
152148
extern HeapTuple heap_copytuple(HeapTuple tuple);
153-
extern HeapTuple
154-
heap_formtuple(TupleDesc tupleDescriptor,
149+
extern HeapTuple heap_formtuple(TupleDesc tupleDescriptor,
155150
Datum value[], char nulls[]);
156-
extern HeapTuple
157-
heap_modifytuple(HeapTuple tuple, Buffer buffer,
151+
extern HeapTuple heap_modifytuple(HeapTuple tuple, Buffer buffer,
158152
Relation relation, Datum replValue[], char replNull[], char repl[]);
159153
HeapTuple heap_addheader(uint32 natts, int structlen, char *structure);
160154

@@ -163,8 +157,7 @@ extern void PrintHeapAccessStatistics(HeapAccessStatistics stats);
163157
extern void initam(void);
164158

165159
/* hio.c */
166-
extern void
167-
RelationPutHeapTuple(Relation relation, BlockNumber blockIndex,
160+
extern void RelationPutHeapTuple(Relation relation, BlockNumber blockIndex,
168161
HeapTuple tuple);
169162
extern void RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple);
170163

‎src/include/access/hio.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: hio.h,v 1.5 1997/09/08 02:34:11 momjian Exp $
9+
* $Id: hio.h,v 1.6 1998/01/24 22:48:01 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -17,8 +17,7 @@
1717
#include <utils/rel.h>
1818

1919

20-
extern void
21-
RelationPutHeapTuple(Relation relation, BlockNumber blockIndex,
20+
extern void RelationPutHeapTuple(Relation relation, BlockNumber blockIndex,
2221
HeapTuple tuple);
2322
extern void RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple);
2423

‎src/include/access/iqual.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: iqual.h,v 1.7 1997/09/08 21:50:48 momjian Exp $
9+
* $Id: iqual.h,v 1.8 1998/01/24 22:48:05 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -24,8 +24,7 @@
2424

2525
extern int NIndexTupleProcessed;
2626

27-
extern bool
28-
index_keytest(IndexTuple tuple, TupleDesc tupdesc,
27+
extern bool index_keytest(IndexTuple tuple, TupleDesc tupdesc,
2928
int scanKeySize, ScanKey key);
3029

3130
#endif /* IQUAL_H */

‎src/include/access/istrat.h

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: istrat.h,v 1.8 1997/09/08 21:50:50 momjian Exp $
9+
* $Id: istrat.h,v 1.9 1998/01/24 22:48:05 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -47,23 +47,18 @@
4747
*/
4848
#define IndexStrategyIsValid(s) PointerIsValid(s)
4949

50-
extern StrategyMap
51-
IndexStrategyGetStrategyMap(IndexStrategy indexStrategy,
50+
extern StrategyMap IndexStrategyGetStrategyMap(IndexStrategy indexStrategy,
5251
StrategyNumber maxStrategyNum, AttrNumber attrNum);
5352

54-
extern Size
55-
AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber,
53+
extern Size AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber,
5654
StrategyNumber maxStrategyNumber);
57-
extern StrategyNumber
58-
RelationGetStrategy(Relation relation,
55+
extern StrategyNumber RelationGetStrategy(Relation relation,
5956
AttrNumber attributeNumber, StrategyEvaluation evaluation,
6057
RegProcedure procedure);
61-
extern bool
62-
RelationInvokeStrategy(Relation relation,
58+
extern bool RelationInvokeStrategy(Relation relation,
6359
StrategyEvaluation evaluation, AttrNumber attributeNumber,
6460
StrategyNumber strategy, Datum left, Datum right);
65-
extern void
66-
IndexSupportInitialize(IndexStrategy indexStrategy,
61+
extern void IndexSupportInitialize(IndexStrategy indexStrategy,
6762
RegProcedure *indexSupport, Oid indexObjectId,
6863
Oid accessMethodObjectId, StrategyNumber maxStrategyNumber,
6964
StrategyNumber maxSupportNumber, AttrNumber maxAttributeNumber);

‎src/include/access/itup.h

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: itup.h,v 1.8 1997/09/08 21:50:53 momjian Exp $
9+
* $Id: itup.h,v 1.9 1998/01/24 22:48:06 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -89,14 +89,11 @@ typedef struct PredInfo
8989

9090

9191
/* indextuple.h */
92-
extern IndexTuple
93-
index_formtuple(TupleDesc tupleDescriptor,
92+
extern IndexTuple index_formtuple(TupleDesc tupleDescriptor,
9493
Datum value[], char null[]);
95-
extern Datum
96-
index_getattr(IndexTuple tuple, AttrNumber attNum,
94+
extern Datum index_getattr(IndexTuple tuple, AttrNumber attNum,
9795
TupleDesc tupDesc, bool *isNullOutP);
98-
extern RetrieveIndexResult
99-
FormRetrieveIndexResult(ItemPointer indexItemPointer,
96+
extern RetrieveIndexResult FormRetrieveIndexResult(ItemPointer indexItemPointer,
10097
ItemPointer heapItemPointer);
10198
extern void CopyIndexTuple(IndexTuple source, IndexTuple *target);
10299

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy