Skip to content

Commit a70e74b

Browse files
committed
Put external declarations into header files.
1 parent 040bb78 commit a70e74b

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
#ifdef XLOG
2727
#include "access/xlogutils.h"
28-
void gist_redo(XLogRecPtr lsn, XLogRecord *record);
29-
void gist_undo(XLogRecPtr lsn, XLogRecord *record);
30-
void gist_desc(char *buf, uint8 xl_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:54 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.45 2000/11/21 21:15:54 petere Exp $
1212
*
1313
* NOTES
1414
* This file contains only the public interface routines.
@@ -29,9 +29,6 @@ bool BuildingHash = false;
2929

3030
#ifdef XLOG
3131
#include "access/xlogutils.h"
32-
void hash_redo(XLogRecPtr lsn, XLogRecord *record);
33-
void hash_undo(XLogRecPtr lsn, XLogRecord *record);
34-
void hash_desc(char *buf, uint8 xl_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
#ifdef XLOG
9090
#include "access/xlogutils.h"
9191

92-
void heap_redo(XLogRecPtr lsn, XLogRecord *record);
93-
void heap_undo(XLogRecPtr lsn, XLogRecord *record);
94-
void heap_desc(char *buf, uint8 xl_info, char* rec);
95-
9692
XLogRecPtr log_heap_move(Relation reln, ItemPointerData from, HeapTuple newtup);
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:55 tgl Exp $
15+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.71 2000/11/21 21:15:55 petere Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -35,9 +35,6 @@ bool FastBuild = true; /* use sort/build instead of insertion
3535
#ifdef XLOG
3636
#include "access/xlogutils.h"
3737

38-
void btree_redo(XLogRecPtr lsn, XLogRecord *record);
39-
void btree_undo(XLogRecPtr lsn, XLogRecord *record);
40-
void btree_desc(char *buf, uint8 xl_info, char* rec);
4138
#endif
4239

4340
static void _bt_restscan(IndexScanDesc scan);

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
int nbytes_btitem;
134135
BTItem btitem;
135136
Size tuplen;
136-
extern Oid newoid();
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:55 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.56 2000/11/21 21:15:55 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -24,9 +24,6 @@
2424

2525
#ifdef XLOG
2626
#include "access/xlogutils.h"
27-
void rtree_redo(XLogRecPtr lsn, XLogRecord *record);
28-
void rtree_undo(XLogRecPtr lsn, XLogRecord *record);
29-
void rtree_desc(char *buf, uint8 xl_info, char* rec);
3027
#endif
3128

3229
typedef struct SPLITVEC

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
#ifdef XLOG
5-
extern void xlog_redo(XLogRecPtr lsn, XLogRecord *rptr);
6-
extern void xlog_undo(XLogRecPtr lsn, XLogRecord *rptr);
7-
extern void xlog_desc(char *buf, uint8 xl_info, char* rec);
8-
9-
extern void xact_redo(XLogRecPtr lsn, XLogRecord *rptr);
10-
extern void xact_undo(XLogRecPtr lsn, XLogRecord *rptr);
11-
extern void xact_desc(char *buf, uint8 xl_info, char* rec);
12-
13-
extern void smgr_redo(XLogRecPtr lsn, XLogRecord *rptr);
14-
extern void smgr_undo(XLogRecPtr lsn, XLogRecord *rptr);
15-
extern void smgr_desc(char *buf, uint8 xl_info, char* rec);
16-
17-
extern void heap_redo(XLogRecPtr lsn, XLogRecord *rptr);
18-
extern void heap_undo(XLogRecPtr lsn, XLogRecord *rptr);
19-
extern void heap_desc(char *buf, uint8 xl_info, char* rec);
20-
21-
extern void btree_redo(XLogRecPtr lsn, XLogRecord *rptr);
22-
extern void btree_undo(XLogRecPtr lsn, XLogRecord *rptr);
23-
extern void btree_desc(char *buf, uint8 xl_info, char* rec);
24-
25-
extern void hash_redo(XLogRecPtr lsn, XLogRecord *rptr);
26-
extern void hash_undo(XLogRecPtr lsn, XLogRecord *rptr);
27-
extern void hash_desc(char *buf, uint8 xl_info, char* rec);
28-
29-
extern void rtree_redo(XLogRecPtr lsn, XLogRecord *rptr);
30-
extern void rtree_undo(XLogRecPtr lsn, XLogRecord *rptr);
31-
extern void rtree_desc(char *buf, uint8 xl_info, char* rec);
32-
33-
extern void gist_redo(XLogRecPtr lsn, XLogRecord *rptr);
34-
extern void gist_undo(XLogRecPtr lsn, XLogRecord *rptr);
35-
extern void gist_desc(char *buf, uint8 xl_info, char* rec);
3612

3713
RmgrData RmgrTable[] = {
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
static int RecoveryCheckingEnabled(void);
2628
static void TransRecover(Relation logRelation);
@@ -77,17 +79,6 @@ TransactionId FirstTransactionId = (TransactionId) 514;
7779
*/
7880
int RecoveryCheckingEnableState = 0;
7981

80-
/* ------------------
81-
* spinlock for oid generation
82-
* -----------------
83-
*/
84-
extern int OidGenLockId;
85-
86-
#ifdef XLOG
87-
#include "miscadmin.h"
88-
extern VariableCache ShmemVariableCache;
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 @@ int XactIsoLevel;
224224

225225
int CommitDelay = 5; /* 1/200 sec */
226226

227-
void xact_redo(XLogRecPtr lsn, XLogRecord *record);
228-
void xact_undo(XLogRecPtr lsn, XLogRecord *record);
229-
void xact_desc(char *buf, uint8 xl_info, char* rec);
230-
231227
static void (*_RollbackFunc)(void*) = NULL;
232228
static void *_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/21 10:17:57 vadim Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.32 2000/11/21 21:15:57 petere 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-
void UpdateControlFile(void);
36-
int XLOGShmemSize(void);
37-
void XLOGShmemInit(void);
38-
void BootStrapXLOG(void);
39-
void StartupXLOG(void);
40-
void ShutdownXLOG(void);
41-
void CreateCheckPoint(bool shutdown);
42-
4337
char XLogDir[MAXPGPATH];
4438
char ControlFilePath[MAXPGPATH];
4539
int XLOGbuffers = 8;
@@ -56,8 +50,6 @@ SPINLOCK ControlFileLockId;
5650
/* To generate new xid */
5751
SPINLOCK XidGenLockId;
5852

59-
extern VariableCache ShmemVariableCache;
60-
6153
#define MinXLOGbuffers 4
6254

6355
typedef struct XLgwrRqst
@@ -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-
void SetThisStartUpID(void);
1635-
16361626
void
16371627
SetThisStartUpID(void)
16381628
{
@@ -1645,9 +1635,6 @@ SetThisStartUpID(void)
16451635
void
16461636
ShutdownXLOG()
16471637
{
1648-
#ifdef XLOG
1649-
extern void CreateDummyCaches(void);
1650-
#endif
16511638
elog(LOG, "Data Base System shutting down at %s", str_time(time(NULL)));
16521639

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

1832-
void xlog_redo(XLogRecPtr lsn, XLogRecord *record);
1833-
void xlog_undo(XLogRecPtr lsn, XLogRecord *record);
1834-
void xlog_desc(char *buf, uint8 xl_info, char* rec);
18351819

18361820
void
18371821
xlog_redo(XLogRecPtr lsn, XLogRecord *record)

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