diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-04-05 21:04:50 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-04-05 21:04:50 +0000 |
| commit | 4b6fcc4459991fa65b1389c8e05e3e3b9a8bd35a (patch) | |
| tree | d8af30288830fdfa8ecb2f0d5b500107c578f87f /src/backend/utils | |
| parent | 9e45687df5148b0c541c5c23a72b84b506e29b1b (diff) | |
| download | postgresql-4b6fcc4459991fa65b1389c8e05e3e3b9a8bd35a.tar.gz | |
Remove GetDatabaseName/Path and use globals. Make consts later.
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 25 | ||||
| -rw-r--r-- | src/backend/utils/init/postinit.c | 8 |
2 files changed, 5 insertions, 28 deletions
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 00d9f8c804..b9a5062f48 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 226f9ba23b..76042390cc 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, |