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

Commita70e74b

Browse files
committed
Put external declarations into header files.
1 parent040bb78 commita70e74b

File tree

36 files changed

+127
-169
lines changed

36 files changed

+127
-169
lines changed

‎src/backend/access/gist/gist.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.65 2000/11/16 22:30:15 tgl Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.66 2000/11/21 21:15:53 petere Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -25,9 +25,6 @@
2525

2626
#ifdefXLOG
2727
#include"access/xlogutils.h"
28-
voidgist_redo(XLogRecPtrlsn,XLogRecord*record);
29-
voidgist_undo(XLogRecPtrlsn,XLogRecord*record);
30-
voidgist_desc(char*buf,uint8xl_info,char*rec);
3128
#endif
3229

3330
/* non-export function prototypes */

‎src/backend/access/hash/hash.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.44 2000/11/08 22:09:54tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.45 2000/11/21 21:15:54petere Exp $
1212
*
1313
* NOTES
1414
* This file contains only the public interface routines.
@@ -29,9 +29,6 @@ boolBuildingHash = false;
2929

3030
#ifdefXLOG
3131
#include"access/xlogutils.h"
32-
voidhash_redo(XLogRecPtrlsn,XLogRecord*record);
33-
voidhash_undo(XLogRecPtrlsn,XLogRecord*record);
34-
voidhash_desc(char*buf,uint8xl_info,char*rec);
3532
#endif
3633

3734

‎src/backend/access/heap/heapam.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.95 2000/11/20 21:14:13 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.96 2000/11/21 21:15:54 petere Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -89,10 +89,6 @@
8989
#ifdefXLOG
9090
#include"access/xlogutils.h"
9191

92-
voidheap_redo(XLogRecPtrlsn,XLogRecord*record);
93-
voidheap_undo(XLogRecPtrlsn,XLogRecord*record);
94-
voidheap_desc(char*buf,uint8xl_info,char*rec);
95-
9692
XLogRecPtrlog_heap_move(Relationreln,ItemPointerDatafrom,HeapTuplenewtup);
9793

9894
/* comments are in heap_update */

‎src/backend/access/nbtree/nbtree.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Portions Copyright (c) 1994, Regents of the University of California
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.70 2000/11/08 22:09:55tgl Exp $
15+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.71 2000/11/21 21:15:55petere Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -35,9 +35,6 @@ boolFastBuild = true;/* use sort/build instead of insertion
3535
#ifdefXLOG
3636
#include"access/xlogutils.h"
3737

38-
voidbtree_redo(XLogRecPtrlsn,XLogRecord*record);
39-
voidbtree_undo(XLogRecPtrlsn,XLogRecord*record);
40-
voidbtree_desc(char*buf,uint8xl_info,char*rec);
4138
#endif
4239

4340
staticvoid_bt_restscan(IndexScanDescscan);

‎src/backend/access/nbtree/nbtutils.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.40 2000/07/25 04:47:59 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.41 2000/11/21 21:15:55 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -18,6 +18,7 @@
1818
#include"access/genam.h"
1919
#include"access/istrat.h"
2020
#include"access/nbtree.h"
21+
#include"catalog/catalog.h"
2122
#include"executor/execdebug.h"
2223

2324

@@ -133,7 +134,6 @@ _bt_formitem(IndexTuple itup)
133134
intnbytes_btitem;
134135
BTItembtitem;
135136
Sizetuplen;
136-
externOidnewoid();
137137

138138
/* make a copy of the index tuple with room for extra stuff */
139139
tuplen=IndexTupleSize(itup);

‎src/backend/access/rtree/rtree.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.55 2000/11/08 22:09:55tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.56 2000/11/21 21:15:55petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -24,9 +24,6 @@
2424

2525
#ifdefXLOG
2626
#include"access/xlogutils.h"
27-
voidrtree_redo(XLogRecPtrlsn,XLogRecord*record);
28-
voidrtree_undo(XLogRecPtrlsn,XLogRecord*record);
29-
voidrtree_desc(char*buf,uint8xl_info,char*rec);
3027
#endif
3128

3229
typedefstructSPLITVEC

‎src/backend/access/transam/rmgr.c

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,14 @@
11
#include"postgres.h"
2+
#include"access/gist.h"
3+
#include"access/hash.h"
4+
#include"access/heapam.h"
5+
#include"access/nbtree.h"
6+
#include"access/rtree.h"
7+
#include"access/xact.h"
28
#include"access/xlog.h"
9+
#include"storage/smgr.h"
310

411
#ifdefXLOG
5-
externvoidxlog_redo(XLogRecPtrlsn,XLogRecord*rptr);
6-
externvoidxlog_undo(XLogRecPtrlsn,XLogRecord*rptr);
7-
externvoidxlog_desc(char*buf,uint8xl_info,char*rec);
8-
9-
externvoidxact_redo(XLogRecPtrlsn,XLogRecord*rptr);
10-
externvoidxact_undo(XLogRecPtrlsn,XLogRecord*rptr);
11-
externvoidxact_desc(char*buf,uint8xl_info,char*rec);
12-
13-
externvoidsmgr_redo(XLogRecPtrlsn,XLogRecord*rptr);
14-
externvoidsmgr_undo(XLogRecPtrlsn,XLogRecord*rptr);
15-
externvoidsmgr_desc(char*buf,uint8xl_info,char*rec);
16-
17-
externvoidheap_redo(XLogRecPtrlsn,XLogRecord*rptr);
18-
externvoidheap_undo(XLogRecPtrlsn,XLogRecord*rptr);
19-
externvoidheap_desc(char*buf,uint8xl_info,char*rec);
20-
21-
externvoidbtree_redo(XLogRecPtrlsn,XLogRecord*rptr);
22-
externvoidbtree_undo(XLogRecPtrlsn,XLogRecord*rptr);
23-
externvoidbtree_desc(char*buf,uint8xl_info,char*rec);
24-
25-
externvoidhash_redo(XLogRecPtrlsn,XLogRecord*rptr);
26-
externvoidhash_undo(XLogRecPtrlsn,XLogRecord*rptr);
27-
externvoidhash_desc(char*buf,uint8xl_info,char*rec);
28-
29-
externvoidrtree_redo(XLogRecPtrlsn,XLogRecord*rptr);
30-
externvoidrtree_undo(XLogRecPtrlsn,XLogRecord*rptr);
31-
externvoidrtree_desc(char*buf,uint8xl_info,char*rec);
32-
33-
externvoidgist_redo(XLogRecPtrlsn,XLogRecord*rptr);
34-
externvoidgist_undo(XLogRecPtrlsn,XLogRecord*rptr);
35-
externvoidgist_desc(char*buf,uint8xl_info,char*rec);
3612

3713
RmgrDataRmgrTable[]= {
3814
{"XLOG",xlog_redo,xlog_undo,xlog_desc},

‎src/backend/access/transam/transam.c

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.36 2000/11/03 11:39:35 vadim Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.37 2000/11/21 21:15:57 petere Exp $
1212
*
1313
* NOTES
1414
* This file contains the high level access-method interface to the
@@ -20,7 +20,9 @@
2020
#include"postgres.h"
2121

2222
#include"access/heapam.h"
23+
#include"access/transam.h"
2324
#include"catalog/catname.h"
25+
#include"miscadmin.h"
2426

2527
staticintRecoveryCheckingEnabled(void);
2628
staticvoidTransRecover(RelationlogRelation);
@@ -77,17 +79,6 @@ TransactionId FirstTransactionId = (TransactionId) 514;
7779
*/
7880
intRecoveryCheckingEnableState=0;
7981

80-
/* ------------------
81-
*spinlock for oid generation
82-
* -----------------
83-
*/
84-
externintOidGenLockId;
85-
86-
#ifdefXLOG
87-
#include"miscadmin.h"
88-
externVariableCacheShmemVariableCache;
89-
#endif
90-
9182
/* ----------------
9283
*recovery checking accessors
9384
* ----------------

‎src/backend/access/transam/xact.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.83 2000/11/16 22:30:16 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.84 2000/11/21 21:15:57 petere Exp $
1212
*
1313
* NOTES
1414
*Transaction aborts can now occur two ways:
@@ -224,10 +224,6 @@ intXactIsoLevel;
224224

225225
intCommitDelay=5;/* 1/200 sec */
226226

227-
voidxact_redo(XLogRecPtrlsn,XLogRecord*record);
228-
voidxact_undo(XLogRecPtrlsn,XLogRecord*record);
229-
voidxact_desc(char*buf,uint8xl_info,char*rec);
230-
231227
staticvoid (*_RollbackFunc)(void*)=NULL;
232228
staticvoid*_RollbackData=NULL;
233229

‎src/backend/access/transam/xlog.c

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.31 2000/11/2110:17:57vadim Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.32 2000/11/2121:15:57petere Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313

14+
#include"postgres.h"
15+
1416
#include<fcntl.h>
1517
#include<unistd.h>
1618
#include<errno.h>
@@ -19,8 +21,7 @@
1921
#include<sys/types.h>
2022
#include<dirent.h>
2123

22-
#include"postgres.h"
23-
24+
#include"access/transam.h"
2425
#include"access/xact.h"
2526
#include"catalog/catversion.h"
2627
#include"storage/sinval.h"
@@ -29,17 +30,10 @@
2930
#include"storage/s_lock.h"
3031
#include"access/xlog.h"
3132
#include"access/xlogutils.h"
33+
#include"utils/relcache.h"
3234

3335
#include"miscadmin.h"
3436

35-
voidUpdateControlFile(void);
36-
intXLOGShmemSize(void);
37-
voidXLOGShmemInit(void);
38-
voidBootStrapXLOG(void);
39-
voidStartupXLOG(void);
40-
voidShutdownXLOG(void);
41-
voidCreateCheckPoint(boolshutdown);
42-
4337
charXLogDir[MAXPGPATH];
4438
charControlFilePath[MAXPGPATH];
4539
intXLOGbuffers=8;
@@ -56,8 +50,6 @@ SPINLOCKControlFileLockId;
5650
/* To generate new xid */
5751
SPINLOCKXidGenLockId;
5852

59-
externVariableCacheShmemVariableCache;
60-
6153
#defineMinXLOGbuffers4
6254

6355
typedefstructXLgwrRqst
@@ -1239,7 +1231,7 @@ UpdateControlFile()
12391231
}
12401232

12411233
int
1242-
XLOGShmemSize()
1234+
XLOGShmemSize(void)
12431235
{
12441236
if (XLOGbuffers<MinXLOGbuffers)
12451237
XLOGbuffers=MinXLOGbuffers;
@@ -1631,8 +1623,6 @@ StartupXLOG()
16311623
* Postmaster uses it to set ThisStartUpID from XLogCtlData
16321624
* located in shmem after successful startup.
16331625
*/
1634-
voidSetThisStartUpID(void);
1635-
16361626
void
16371627
SetThisStartUpID(void)
16381628
{
@@ -1645,9 +1635,6 @@ SetThisStartUpID(void)
16451635
void
16461636
ShutdownXLOG()
16471637
{
1648-
#ifdefXLOG
1649-
externvoidCreateDummyCaches(void);
1650-
#endif
16511638
elog(LOG,"Data Base System shutting down at %s",str_time(time(NULL)));
16521639

16531640
#ifdefXLOG
@@ -1829,9 +1816,6 @@ XLogPutNextOid(Oid nextOid)
18291816
(char*)&nextOid,sizeof(Oid),NULL,0);
18301817
}
18311818

1832-
voidxlog_redo(XLogRecPtrlsn,XLogRecord*record);
1833-
voidxlog_undo(XLogRecPtrlsn,XLogRecord*record);
1834-
voidxlog_desc(char*buf,uint8xl_info,char*rec);
18351819

18361820
void
18371821
xlog_redo(XLogRecPtrlsn,XLogRecord*record)

‎src/backend/access/transam/xlogutils.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include"access/xlogutils.h"
2424
#include"catalog/pg_database.h"
2525
#include"lib/hasht.h"
26+
#include"utils/relcache.h"
2627

2728
/*
2829
* ---------------------------------------------------------------
@@ -313,8 +314,6 @@ _xl_new_reldesc(void)
313314
return(res);
314315
}
315316

316-
externvoidCreateDummyCaches(void);
317-
externvoidDestroyDummyCaches(void);
318317

319318
void
320319
XLogInitRelationCache(void)

‎src/backend/bootstrap/bootparse.y

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.32 2000/07/14 22:17:38 tgl Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.33 2000/11/21 21:15:59 petere Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -27,6 +27,7 @@
2727
#include"access/tupdesc.h"
2828
#include"access/xact.h"
2929
#include"bootstrap/bootstrap.h"
30+
#include"catalog/catalog.h"
3031
#include"catalog/heap.h"
3132
#include"catalog/pg_am.h"
3233
#include"catalog/pg_attribute.h"
@@ -288,7 +289,7 @@ boot_type_thing:
288289

289290
optoideq:
290291
OBJ_ID EQUALS boot_ident {$$ = atol(LexIDStr($3));}
291-
|{extern Oidnewoid();$$ = newoid();}
292+
|{$$ = newoid();}
292293
;
293294

294295
boot_tuplelist:

0 commit comments

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