2 files changed, 5 insertions, 28 deletions
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 00d9f8c804a..b9a5062f483 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.13 1998/04/05 05:51:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.14 1998/04/05 21:04:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,9 +47,7 @@
 extern char *getenv(const char *name);	/* XXX STDLIB */
 
 /*	from globals.c */
-extern char *DatabaseName;
 extern char *UserName;
-extern char *DatabasePath;
 
 #ifdef CYR_RECODE
 unsigned char RecodeForwTable[128];
@@ -224,27 +222,6 @@ GetProcessingMode()
  * ----------------------------------------------------------------
  */
 
-/*
- * GetDatabasePath --
- *		Returns path to database.
- *
- */
-const char *
-GetDatabasePath()
-{
-	return DatabasePath;
-}
-
-/*
- * GetDatabaseName --
- *		Returns name of database.
- */
-const char *
-GetDatabaseName()
-{
-	return DatabaseName;
-}
-
 void
 SetDatabasePath(char *path)
 {
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 226f9ba23b8..76042390cc0 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.26 1998/04/05 05:52:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.27 1998/04/05 21:04:43 momjian Exp $
  *
  * NOTES
  *		InitPostgres() is the function called from PostgresMain
@@ -126,7 +126,7 @@ InitMyDatabaseInfo(char *name)
 	if (!OidIsValid(MyDatabaseId))
 		elog(FATAL,
 			 "Database %s does not exist in %s",
-			 GetDatabaseName(),
+			 DatabaseName,
 			 DatabaseRelationName);
 
 	path = ExpandDatabasePath(myPath);
@@ -203,8 +203,8 @@ VerifyMyDatabase()
 	int			fd;
 	char		errormsg[1000];
 
-	name = GetDatabaseName();
-	myPath = GetDatabasePath();
+	name = DatabaseName;
+	myPath = DatabasePath;
 
 	if ((fd = open(myPath, O_RDONLY, 0)) == -1)
 		sprintf(errormsg,