From 03a7cd1788734d63b013fc8ada0f07571f760cbc Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 5 Apr 1998 05:52:10 +0000
Subject: [PATCH] Fix for memory leak.
---
src/backend/utils/init/miscinit.c | 10 +++++-----
src/backend/utils/init/postinit.c | 6 +++---
src/include/miscadmin.h | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index abd6aa8b2a2..00d9f8c804a 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.12 1998/02/26 04:38:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.13 1998/04/05 05:51:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -229,20 +229,20 @@ GetProcessingMode()
* Returns path to database.
*
*/
-char *
+const char *
GetDatabasePath()
{
- return strdup(DatabasePath);
+ return DatabasePath;
}
/*
* GetDatabaseName --
* Returns name of database.
*/
-char *
+const char *
GetDatabaseName()
{
- return strdup(DatabaseName);
+ return DatabaseName;
}
void
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index baac25cfbee..226f9ba23b8 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.25 1998/02/26 04:38:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.26 1998/04/05 05:52:00 momjian Exp $
*
* NOTES
* InitPostgres() is the function called from PostgresMain
@@ -195,8 +195,8 @@ VerifySystemDatabase()
static void
VerifyMyDatabase()
{
- char *name;
- char *myPath;
+ const char *name;
+ const char *myPath;
/* Failure reason returned by some function. NULL if no failure */
char *reason;
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 9b7749323ae..2080d19ac78 100644
--- 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.20 1998/02/26 04:39:48 momjian Exp $
+ * $Id: miscadmin.h,v 1.21 1998/04/05 05:52:10 momjian Exp $
*
* NOTES
* some of the information in this file will be moved to
@@ -116,8 +116,8 @@ extern int GetDatabaseInfo(char *name, Oid *owner, char *path);
extern char *ExpandDatabasePath(char *path);
/* now in utils/init/miscinit.c */
-extern char *GetDatabasePath(void);
-extern char *GetDatabaseName(void);
+extern const char *GetDatabasePath(void);
+extern const char *GetDatabaseName(void);
extern void SetDatabaseName(char *name);
extern void SetDatabasePath(char *path);
extern char *getpgusername(void);
--
GitLab