Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7229513

Browse files
committed
Fix prototypes so they don't look like function definitions.
1 parent27317a0 commit7229513

File tree

82 files changed

+289
-499
lines changed

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
externRelationindex_open(OidrelationId);
2626
externRelationindex_openr(char*relationName);
2727
externvoidindex_close(Relationrelation);
28-
externInsertIndexResult
29-
index_insert(Relationrelation,
28+
externInsertIndexResultindex_insert(Relationrelation,
3029
Datum*datum,char*nulls,
3130
ItemPointerheap_t_ctid,
3231
RelationheapRel);
3332
externvoidindex_delete(Relationrelation,ItemPointerindexItem);
34-
externIndexScanDesc
35-
index_beginscan(Relationrelation,boolscanFromEnd,
33+
externIndexScanDescindex_beginscan(Relationrelation,boolscanFromEnd,
3634
uint16numberOfKeys,ScanKeykey);
3735
externvoidindex_rescan(IndexScanDescscan,boolscanFromEnd,ScanKeykey);
3836
externvoidindex_endscan(IndexScanDescscan);
39-
externRetrieveIndexResult
40-
index_getnext(IndexScanDescscan,
37+
externRetrieveIndexResultindex_getnext(IndexScanDescscan,
4138
ScanDirectiondirection);
42-
externRegProcedure
43-
index_getprocid(Relationirel,AttrNumberattnum,
39+
externRegProcedureindex_getprocid(Relationirel,AttrNumberattnum,
4440
uint16procnum);
45-
externDatum
46-
GetIndexValue(HeapTupletuple,TupleDeschTupDesc,
41+
externDatumGetIndexValue(HeapTupletuple,TupleDeschTupDesc,
4742
intattOff,AttrNumberattrNums[],FuncIndexInfo*fInfo,
4843
bool*attNull,Bufferbuffer);
4944

5045
/* in genam.c */
51-
externIndexScanDesc
52-
RelationGetIndexScan(Relationrelation,boolscanFromEnd,
46+
externIndexScanDescRelationGetIndexScan(Relationrelation,boolscanFromEnd,
5347
uint16numberOfKeys,ScanKeykey);
5448
externvoidIndexScanMarkPosition(IndexScanDescscan);
5549
externvoidIndexScanRestorePosition(IndexScanDescscan);

‎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
intflag;
189189
}INTRANGE;
190190

191-
externvoid
192-
gistbuild(Relationheap,
191+
externvoidgistbuild(Relationheap,
193192
Relationindex,intnatts,
194193
AttrNumber*attnum,IndexStrategyistrat,
195194
uint16pint,Datum*params,
196195
FuncIndexInfo*finfo,
197196
PredInfo*predInfo);
198-
externInsertIndexResult
199-
gistinsert(Relationr,Datum*datum,
197+
externInsertIndexResultgistinsert(Relationr,Datum*datum,
200198
char*nulls,ItemPointerht_ctid,RelationheapRel);
201199
externvoid_gistdump(Relationr);
202200
externvoidgistfreestack(GISTSTACK*s);
203201
externvoidinitGISTstate(GISTSTATE*giststate,Relationindex);
204-
externvoid
205-
gistdentryinit(GISTSTATE*giststate,GISTENTRY*e,char*pr,
202+
externvoidgistdentryinit(GISTSTATE*giststate,GISTENTRY*e,char*pr,
206203
Relationr,Pagepg,OffsetNumbero,intb,booll);
207204
externStrategyNumberRelationGetGISTStrategy(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-
externIndexScanDesc
20-
gistbeginscan(Relationr,boolfromEnd,
19+
externIndexScanDescgistbeginscan(Relationr,boolfromEnd,
2120
uint16nkeys,ScanKeykey);
2221
externvoidgistrescan(IndexScanDescs,boolfromEnd,ScanKeykey);
2322
externvoidgistmarkpos(IndexScanDescs);

‎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-
externStrategyNumber
19-
RelationGetGISTStrategy(Relationr,
18+
externStrategyNumberRelationGetGISTStrategy(Relationr,
2019
AttrNumberattnum,RegProcedureproc);
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-
externvoid
252-
hashbuild(Relationheap,Relationindex,intnatts,
251+
externvoidhashbuild(Relationheap,Relationindex,intnatts,
253252
AttrNumber*attnum,IndexStrategyistrat,uint16pcount,
254253
Datum*params,FuncIndexInfo*finfo,PredInfo*predInfo);
255-
externInsertIndexResult
256-
hashinsert(Relationrel,Datum*datum,char*nulls,
254+
externInsertIndexResulthashinsert(Relationrel,Datum*datum,char*nulls,
257255
ItemPointerht_ctid,RelationheapRel);
258256
externchar*hashgettuple(IndexScanDescscan,ScanDirectiondir);
259-
externchar*
260-
hashbeginscan(Relationrel,boolfromEnd,uint16keysz,
257+
externchar*hashbeginscan(Relationrel,boolfromEnd,uint16keysz,
261258
ScanKeyscankey);
262259
externvoidhashrescan(IndexScanDescscan,boolfromEnd,ScanKeyscankey);
263260
externvoidhashendscan(IndexScanDescscan);
@@ -288,11 +285,9 @@ extern InsertIndexResult _hash_doinsert(Relation rel, HashItem hitem);
288285
/* hashovfl.c */
289286
externBuffer_hash_addovflpage(Relationrel,Buffer*metabufp,Bufferbuf);
290287
externBuffer_hash_freeovflpage(Relationrel,Bufferovflbuf);
291-
externint32
292-
_hash_initbitmap(Relationrel,HashMetaPagemetap,int32pnum,
288+
externint32_hash_initbitmap(Relationrel,HashMetaPagemetap,int32pnum,
293289
int32nbits,int32ndx);
294-
externvoid
295-
_hash_squeezebucket(Relationrel,HashMetaPagemetap,
290+
externvoid_hash_squeezebucket(Relationrel,HashMetaPagemetap,
296291
Bucketbucket);
297292

298293

@@ -302,8 +297,7 @@ extern Buffer _hash_getbuf(Relation rel, BlockNumber blkno, int access);
302297
externvoid_hash_relbuf(Relationrel,Bufferbuf,intaccess);
303298
externvoid_hash_wrtbuf(Relationrel,Bufferbuf);
304299
externvoid_hash_wrtnorelbuf(Relationrel,Bufferbuf);
305-
externPage
306-
_hash_chgbufaccess(Relationrel,Buffer*bufp,intfrom_access,
300+
externPage_hash_chgbufaccess(Relationrel,Buffer*bufp,intfrom_access,
307301
intto_access);
308302
externvoid_hash_pageinit(Pagepage,Sizesize);
309303
externvoid_hash_pagedel(Relationrel,ItemPointertid);
@@ -317,19 +311,16 @@ extern void _hash_adjscans(Relation rel, ItemPointer tid);
317311

318312

319313
/* hashsearch.c */
320-
externvoid
321-
_hash_search(Relationrel,intkeysz,ScanKeyscankey,
314+
externvoid_hash_search(Relationrel,intkeysz,ScanKeyscankey,
322315
Buffer*bufP,HashMetaPagemetap);
323316
externRetrieveIndexResult_hash_next(IndexScanDescscan,ScanDirectiondir);
324317
externRetrieveIndexResult_hash_first(IndexScanDescscan,ScanDirectiondir);
325-
externbool
326-
_hash_step(IndexScanDescscan,Buffer*bufP,ScanDirectiondir,
318+
externbool_hash_step(IndexScanDescscan,Buffer*bufP,ScanDirectiondir,
327319
Buffermetabuf);
328320

329321

330322
/* hashutil.c */
331-
externScanKey
332-
_hash_mkscankey(Relationrel,IndexTupleitup,
323+
externScanKey_hash_mkscankey(Relationrel,IndexTupleitup,
333324
HashMetaPagemetap);
334325
externvoid_hash_freeskey(ScanKeyskey);
335326
externbool_hash_checkqual(IndexScanDescscan,IndexTupleitup);

‎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
*POSTGRESheapaccessmethoddefinitions.
55
*
66
*
77
*Copyright (c)1994,RegentsoftheUniversityofCalifornia
88
*
9-
* $Id: heapam.h,v 1.22 1997/11/20 23:23:31 momjian Exp $
9+
*$Id:heapam.h,v1.231998/01/2422:47:59momjianExp$
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -121,26 +121,22 @@ extern void doinsert(Relation relation, HeapTuple tup);
121121
externRelationheap_open(OidrelationId);
122122
externRelationheap_openr(char*relationName);
123123
externvoidheap_close(Relationrelation);
124-
externHeapScanDesc
125-
heap_beginscan(Relationrelation,intatend,
124+
externHeapScanDescheap_beginscan(Relationrelation,intatend,
126125
boolseeself,unsignednkeys,ScanKeykey);
127126
externvoidheap_rescan(HeapScanDescsdesc,boolscanFromEnd,ScanKeykey);
128127
externvoidheap_endscan(HeapScanDescsdesc);
129128
externHeapTupleheap_getnext(HeapScanDescscandesc,intbackw,Buffer*b);
130-
externHeapTuple
131-
heap_fetch(Relationrelation,boolseeself,ItemPointertid,Buffer*b);
129+
externHeapTupleheap_fetch(Relationrelation,boolseeself,ItemPointertid,Buffer*b);
132130
externOidheap_insert(Relationrelation,HeapTupletup);
133131
externintheap_delete(Relationrelation,ItemPointertid);
134-
externint
135-
heap_replace(Relationrelation,ItemPointerotid,
132+
externintheap_replace(Relationrelation,ItemPointerotid,
136133
HeapTupletup);
137134
externvoidheap_markpos(HeapScanDescsdesc);
138135
externvoidheap_restrpos(HeapScanDescsdesc);
139136

140137
/* in common/heaptuple.c */
141138
externSizeComputeDataSize(TupleDesctupleDesc,Datumvalue[],charnulls[]);
142-
externvoid
143-
DataFill(char*data,TupleDesctupleDesc,
139+
externvoidDataFill(char*data,TupleDesctupleDesc,
144140
Datumvalue[],charnulls[],uint16*infomask,
145141
bits8*bit);
146142
externintheap_attisnull(HeapTupletup,intattnum);
@@ -150,11 +146,9 @@ extern Datum heap_getsysattr(HeapTuple tup, Buffer b, int attnum);
150146
externDatumfastgetattr(HeapTupletup,intattnum,
151147
TupleDescatt,bool*isnull);
152148
externHeapTupleheap_copytuple(HeapTupletuple);
153-
externHeapTuple
154-
heap_formtuple(TupleDesctupleDescriptor,
149+
externHeapTupleheap_formtuple(TupleDesctupleDescriptor,
155150
Datumvalue[],charnulls[]);
156-
externHeapTuple
157-
heap_modifytuple(HeapTupletuple,Bufferbuffer,
151+
externHeapTupleheap_modifytuple(HeapTupletuple,Bufferbuffer,
158152
Relationrelation,DatumreplValue[],charreplNull[],charrepl[]);
159153
HeapTupleheap_addheader(uint32natts,intstructlen,char*structure);
160154

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

165159
/* hio.c */
166-
externvoid
167-
RelationPutHeapTuple(Relationrelation,BlockNumberblockIndex,
160+
externvoidRelationPutHeapTuple(Relationrelation,BlockNumberblockIndex,
168161
HeapTupletuple);
169162
externvoidRelationPutHeapTupleAtEnd(Relationrelation,HeapTupletuple);
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-
externvoid
21-
RelationPutHeapTuple(Relationrelation,BlockNumberblockIndex,
20+
externvoidRelationPutHeapTuple(Relationrelation,BlockNumberblockIndex,
2221
HeapTupletuple);
2322
externvoidRelationPutHeapTupleAtEnd(Relationrelation,HeapTupletuple);
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
externintNIndexTupleProcessed;
2626

27-
externbool
28-
index_keytest(IndexTupletuple,TupleDesctupdesc,
27+
externboolindex_keytest(IndexTupletuple,TupleDesctupdesc,
2928
intscanKeySize,ScanKeykey);
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
#defineIndexStrategyIsValid(s) PointerIsValid(s)
4949

50-
externStrategyMap
51-
IndexStrategyGetStrategyMap(IndexStrategyindexStrategy,
50+
externStrategyMapIndexStrategyGetStrategyMap(IndexStrategyindexStrategy,
5251
StrategyNumbermaxStrategyNum,AttrNumberattrNum);
5352

54-
externSize
55-
AttributeNumberGetIndexStrategySize(AttrNumbermaxAttributeNumber,
53+
externSizeAttributeNumberGetIndexStrategySize(AttrNumbermaxAttributeNumber,
5654
StrategyNumbermaxStrategyNumber);
57-
externStrategyNumber
58-
RelationGetStrategy(Relationrelation,
55+
externStrategyNumberRelationGetStrategy(Relationrelation,
5956
AttrNumberattributeNumber,StrategyEvaluationevaluation,
6057
RegProcedureprocedure);
61-
externbool
62-
RelationInvokeStrategy(Relationrelation,
58+
externboolRelationInvokeStrategy(Relationrelation,
6359
StrategyEvaluationevaluation,AttrNumberattributeNumber,
6460
StrategyNumberstrategy,Datumleft,Datumright);
65-
externvoid
66-
IndexSupportInitialize(IndexStrategyindexStrategy,
61+
externvoidIndexSupportInitialize(IndexStrategyindexStrategy,
6762
RegProcedure*indexSupport,OidindexObjectId,
6863
OidaccessMethodObjectId,StrategyNumbermaxStrategyNumber,
6964
StrategyNumbermaxSupportNumber,AttrNumbermaxAttributeNumber);

‎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-
externIndexTuple
93-
index_formtuple(TupleDesctupleDescriptor,
92+
externIndexTupleindex_formtuple(TupleDesctupleDescriptor,
9493
Datumvalue[],charnull[]);
95-
externDatum
96-
index_getattr(IndexTupletuple,AttrNumberattNum,
94+
externDatumindex_getattr(IndexTupletuple,AttrNumberattNum,
9795
TupleDesctupDesc,bool*isNullOutP);
98-
externRetrieveIndexResult
99-
FormRetrieveIndexResult(ItemPointerindexItemPointer,
96+
externRetrieveIndexResultFormRetrieveIndexResult(ItemPointerindexItemPointer,
10097
ItemPointerheapItemPointer);
10198
externvoidCopyIndexTuple(IndexTuplesource,IndexTuple*target);
10299

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp