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/storage | |
| parent | 9e45687df5148b0c541c5c23a72b84b506e29b1b (diff) | |
| download | postgresql-4b6fcc4459991fa65b1389c8e05e3e3b9a8bd35a.tar.gz postgresql-4b6fcc4459991fa65b1389c8e05e3e3b9a8bd35a.zip | |
Remove GetDatabaseName/Path and use globals. Make consts later.
Diffstat (limited to 'src/backend/storage')
| -rw-r--r-- | src/backend/storage/buffer/bufmgr.c | 4 | ||||
| -rw-r--r-- | src/backend/storage/file/fd.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 29476547c1f..6b75bf5b755 100644 --- 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 9f48b222b2b..969a5e16694 100644 --- 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 { |