Remove GetDatabaseName/Path and use globals. Make consts later.

diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index c5ceb5eed2e2b442899d14b0e6c0f74e346c09ea..67de9f1f0787a5a7d38ea7e5279d7e3beae4dffa 100644 (file)
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.9 1998/03/30 17:22:58 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.10 1998/04/05 21:04:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -229,7 +229,7 @@ check_permissions(char *command,
        }
 
        /* Check to make sure database is not the currently open database */
-       if (!strcmp(dbname, GetDatabaseName()))
+       if (!strcmp(dbname, DatabaseName))
        {
                elog(ERROR, "%s cannot be executed on an open database", command);
        }

diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 29476547c1f1c6f2a88f50aea17a25497e0d07f0..6b75bf5b7555c5bae15ac173cd74a1855f3025cd 100644 (file)
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.35 1998/02/26 04:35:24 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.36 1998/04/05 21:04:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -643,7 +643,7 @@ BufferAlloc(Relation reln,
 
        /* record the database name and relation name for this buffer */
        strcpy(buf->sb_relname, reln->rd_rel->relname.data);
-       strcpy(buf->sb_dbname, GetDatabaseName());
+       strcpy(buf->sb_dbname, DatabaseName);
 
        INIT_BUFFERTAG(&(buf->tag), reln, blockNum);
        if (!BufTableInsert(buf))

diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 9f48b222b2b25fa2aa0d821d8e44975b6c4fbeee..969a5e16694695c27383eb6645b9cd7cf7cc0e35 100644 (file)
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *       $Id: fd.c,v 1.30 1998/02/26 04:35:29 momjian Exp $
+ *       $Id: fd.c,v 1.31 1998/04/05 21:04:27 momjian Exp $
  *
  * NOTES:
  *
@@ -460,8 +460,6 @@ FreeVfd(File file)
  * Open specified file name.
  * Fill in absolute path fields if necessary.
  *
- * Modify to use GetDatabasePath() rather than hardcoded paths.
- * - thomas 1997-11-02
  */
 static char *
 filepath(char *filename)
@@ -472,9 +470,9 @@ filepath(char *filename)
        /* Not an absolute path name? Then fill in with database path... */
        if (*filename != SEP_CHAR)
        {
-               len = strlen(GetDatabasePath()) + strlen(filename) + 2;
+               len = strlen(DatabasePath) + strlen(filename) + 2;
                buf = (char *) palloc(len);
-               sprintf(buf, "%s%c%s", GetDatabasePath(), SEP_CHAR, filename);
+               sprintf(buf, "%s%c%s", DatabasePath, SEP_CHAR, filename);
        }
        else
        {

diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 00d9f8c804ad026264916b240dc58688f4c8d598..b9a5062f483435c5fba9b3e19286ba8d291f791c 100644 (file)
--- 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 226f9ba23b845af89df90c69f2347a450b1a835c..76042390cc0fde1127727c0ec1d894b83b7a55eb 100644 (file)
--- 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,

diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 2080d19ac781e2b106a53abeaf14617f609bf284..f2b26d3bd1b0f63a26071be286853cc2afa14806 100644 (file)
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -11,7 +11,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.21 1998/04/05 05:52:10 momjian Exp $
+ * $Id: miscadmin.h,v 1.22 1998/04/05 21:04:50 momjian Exp $
  *
  * NOTES
  *       some of the information in this file will be moved to
@@ -110,14 +110,15 @@ extern Oid        LastOidProcessed;       /* for query rewrite */
  *                     POSTGRES directory path definitions.                                                     *
  *****************************************************************************/
 
+extern char *DatabaseName;
+extern char *DatabasePath;
+
 /* in utils/misc/database.c */
 extern void GetRawDatabaseInfo(char *name, Oid *owner, Oid *db_id, char *path);
 extern int     GetDatabaseInfo(char *name, Oid *owner, char *path);
 extern char *ExpandDatabasePath(char *path);
 
 /* now in utils/init/miscinit.c */
-extern const char *GetDatabasePath(void);
-extern const char *GetDatabaseName(void);
 extern void SetDatabaseName(char *name);
 extern void SetDatabasePath(char *path);
 extern char *getpgusername(void);