Put external declarations into header files.

postgres · Nov 21, 2000 · a70e74b · a70e74b
1 parent 040bb78
commit a70e74b
Show file tree

Hide file tree

Showing 36 changed files with 127 additions and 169 deletions.
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.65 2000/11/16 22:30:15 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.66 2000/11/21 21:15:53 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,9 +25,6 @@
 
 #ifdef XLOG
 #include "access/xlogutils.h"
-void gist_redo(XLogRecPtr lsn, XLogRecord *record);
-void gist_undo(XLogRecPtr lsn, XLogRecord *record);
-void gist_desc(char *buf, uint8 xl_info, char* rec);
 #endif
 
 /* non-export function prototypes */

diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.44 2000/11/08 22:09:54 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.45 2000/11/21 21:15:54 petere Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -29,9 +29,6 @@ bool		BuildingHash = false;
 
 #ifdef XLOG
 #include "access/xlogutils.h"
-void hash_redo(XLogRecPtr lsn, XLogRecord *record);
-void hash_undo(XLogRecPtr lsn, XLogRecord *record);
-void hash_desc(char *buf, uint8 xl_info, char* rec);
 #endif
 
 

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.95 2000/11/20 21:14:13 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.96 2000/11/21 21:15:54 petere Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -89,10 +89,6 @@
 #ifdef XLOG
 #include "access/xlogutils.h"
 
-void heap_redo(XLogRecPtr lsn, XLogRecord *record);
-void heap_undo(XLogRecPtr lsn, XLogRecord *record);
-void heap_desc(char *buf, uint8 xl_info, char* rec);
-
 XLogRecPtr	log_heap_move(Relation reln, ItemPointerData from, HeapTuple newtup);
 
 /* comments are in heap_update */

diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.70 2000/11/08 22:09:55 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.71 2000/11/21 21:15:55 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,9 +35,6 @@ bool		FastBuild = true;	/* use sort/build instead of insertion
 #ifdef XLOG
 #include "access/xlogutils.h"
 
-void btree_redo(XLogRecPtr lsn, XLogRecord *record);
-void btree_undo(XLogRecPtr lsn, XLogRecord *record);
-void btree_desc(char *buf, uint8 xl_info, char* rec);
 #endif
 
 static void _bt_restscan(IndexScanDesc scan);

diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.40 2000/07/25 04:47:59 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.41 2000/11/21 21:15:55 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #include "access/genam.h"
 #include "access/istrat.h"
 #include "access/nbtree.h"
+#include "catalog/catalog.h"
 #include "executor/execdebug.h"
 
 
@@ -133,7 +134,6 @@ _bt_formitem(IndexTuple itup)
 	int			nbytes_btitem;
 	BTItem		btitem;
 	Size		tuplen;
-	extern Oid	newoid();
 
 	/* make a copy of the index tuple with room for extra stuff */
 	tuplen = IndexTupleSize(itup);

diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.55 2000/11/08 22:09:55 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.56 2000/11/21 21:15:55 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,9 +24,6 @@
 
 #ifdef XLOG
 #include "access/xlogutils.h"
-void rtree_redo(XLogRecPtr lsn, XLogRecord *record);
-void rtree_undo(XLogRecPtr lsn, XLogRecord *record);
-void rtree_desc(char *buf, uint8 xl_info, char* rec);
 #endif
 
 typedef struct SPLITVEC

diff --git a/src/backend/access/transam/rmgr.c b/src/backend/access/transam/rmgr.c
@@ -1,38 +1,14 @@
 #include "postgres.h"
+#include "access/gist.h"
+#include "access/hash.h"
+#include "access/heapam.h"
+#include "access/nbtree.h"
+#include "access/rtree.h"
+#include "access/xact.h"
 #include "access/xlog.h"
+#include "storage/smgr.h"
 
 #ifdef XLOG
-extern void xlog_redo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void xlog_undo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void xlog_desc(char *buf, uint8 xl_info, char* rec);
-
-extern void xact_redo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void xact_undo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void xact_desc(char *buf, uint8 xl_info, char* rec);
-
-extern void smgr_redo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void smgr_undo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void smgr_desc(char *buf, uint8 xl_info, char* rec);
-
-extern void heap_redo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void heap_undo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void heap_desc(char *buf, uint8 xl_info, char* rec);
-
-extern void btree_redo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void btree_undo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void btree_desc(char *buf, uint8 xl_info, char* rec);
-
-extern void hash_redo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void hash_undo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void hash_desc(char *buf, uint8 xl_info, char* rec);
-
-extern void rtree_redo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void rtree_undo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void rtree_desc(char *buf, uint8 xl_info, char* rec);
-
-extern void gist_redo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void gist_undo(XLogRecPtr lsn, XLogRecord *rptr);
-extern void gist_desc(char *buf, uint8 xl_info, char* rec);
 
 RmgrData   RmgrTable[] = {
 {"XLOG", xlog_redo, xlog_undo, xlog_desc},

diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.36 2000/11/03 11:39:35 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.37 2000/11/21 21:15:57 petere Exp $
  *
  * NOTES
  *	  This file contains the high level access-method interface to the
@@ -20,7 +20,9 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
+#include "access/transam.h"
 #include "catalog/catname.h"
+#include "miscadmin.h"
 
 static int	RecoveryCheckingEnabled(void);
 static void TransRecover(Relation logRelation);
@@ -77,17 +79,6 @@ TransactionId FirstTransactionId = (TransactionId) 514;
  */
 int			RecoveryCheckingEnableState = 0;
 
-/* ------------------
- *		spinlock for oid generation
- * -----------------
- */
-extern int	OidGenLockId;
-
-#ifdef XLOG
-#include "miscadmin.h"
-extern VariableCache ShmemVariableCache;
-#endif
-
 /* ----------------
  *		recovery checking accessors
  * ----------------

diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.83 2000/11/16 22:30:16 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.84 2000/11/21 21:15:57 petere Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -224,10 +224,6 @@ int			XactIsoLevel;
 
 int			CommitDelay = 5;	/* 1/200 sec */
 
-void		xact_redo(XLogRecPtr lsn, XLogRecord *record);
-void		xact_undo(XLogRecPtr lsn, XLogRecord *record);
-void		xact_desc(char *buf, uint8 xl_info, char* rec);
-
 static void (*_RollbackFunc)(void*) = NULL;
 static void *_RollbackData = NULL;
 

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -6,11 +6,13 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.31 2000/11/21 10:17:57 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.32 2000/11/21 21:15:57 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
 
+#include "postgres.h"
+
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
@@ -19,8 +21,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-#include "postgres.h"
-
+#include "access/transam.h"
 #include "access/xact.h"
 #include "catalog/catversion.h"
 #include "storage/sinval.h"
@@ -29,17 +30,10 @@
 #include "storage/s_lock.h"
 #include "access/xlog.h"
 #include "access/xlogutils.h"
+#include "utils/relcache.h"
 
 #include "miscadmin.h"
 
-void		UpdateControlFile(void);
-int			XLOGShmemSize(void);
-void		XLOGShmemInit(void);
-void		BootStrapXLOG(void);
-void		StartupXLOG(void);
-void		ShutdownXLOG(void);
-void		CreateCheckPoint(bool shutdown);
-
 char		XLogDir[MAXPGPATH];
 char		ControlFilePath[MAXPGPATH];
 int			XLOGbuffers = 8;
@@ -56,8 +50,6 @@ SPINLOCK	ControlFileLockId;
 /* To generate new xid */
 SPINLOCK	XidGenLockId;
 
-extern VariableCache ShmemVariableCache;
-
 #define MinXLOGbuffers	4
 
 typedef struct XLgwrRqst
@@ -1239,7 +1231,7 @@ UpdateControlFile()
 }
 
 int
-XLOGShmemSize()
+XLOGShmemSize(void)
 {
 	if (XLOGbuffers < MinXLOGbuffers)
 		XLOGbuffers = MinXLOGbuffers;
@@ -1631,8 +1623,6 @@ StartupXLOG()
  * Postmaster uses it to set ThisStartUpID from XLogCtlData
  * located in shmem after successful startup.
  */
-void	SetThisStartUpID(void);
-
 void
 SetThisStartUpID(void)
 {
@@ -1645,9 +1635,6 @@ SetThisStartUpID(void)
 void
 ShutdownXLOG()
 {
-#ifdef XLOG
-	extern void CreateDummyCaches(void);
-#endif
 	elog(LOG, "Data Base System shutting down at %s", str_time(time(NULL)));
 
 #ifdef XLOG
@@ -1829,9 +1816,6 @@ XLogPutNextOid(Oid nextOid)
 					(char *) &nextOid, sizeof(Oid), NULL, 0);
 }
 
-void xlog_redo(XLogRecPtr lsn, XLogRecord *record);
-void xlog_undo(XLogRecPtr lsn, XLogRecord *record);
-void xlog_desc(char *buf, uint8 xl_info, char* rec);
 
 void
 xlog_redo(XLogRecPtr lsn, XLogRecord *record)

diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c
@@ -23,6 +23,7 @@
 #include "access/xlogutils.h"
 #include "catalog/pg_database.h"
 #include "lib/hasht.h"
+#include "utils/relcache.h"
 
 /*
  * ---------------------------------------------------------------
@@ -313,8 +314,6 @@ _xl_new_reldesc(void)
 	return(res);
 }
 
-extern void CreateDummyCaches(void);
-extern void DestroyDummyCaches(void);
 
 void
 XLogInitRelationCache(void)

diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.32 2000/07/14 22:17:38 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.33 2000/11/21 21:15:59 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,6 +27,7 @@
 #include "access/tupdesc.h"
 #include "access/xact.h"
 #include "bootstrap/bootstrap.h"
+#include "catalog/catalog.h"
 #include "catalog/heap.h"
 #include "catalog/pg_am.h"
 #include "catalog/pg_attribute.h"
@@ -288,7 +289,7 @@ boot_type_thing:
 
 optoideq:
 			OBJ_ID EQUALS boot_ident { $$ = atol(LexIDStr($3));				}
-		|						{ extern Oid newoid(); $$ = newoid();	}
+		|						{ $$ = newoid();	}
 		;
 
 boot_tuplelist: