diff options
| author | Marc G. Fournier | 1997-12-09 03:11:25 +0000 |
|---|---|---|
| committer | Marc G. Fournier | 1997-12-09 03:11:25 +0000 |
| commit | da72b903fff0623eb3d24ed8c8aab2030c460be6 (patch) | |
| tree | 42f730906b0de3cf5da7e76a28be9bc41613f792 /src/backend/postmaster | |
| parent | 405740ace68b5488c9cc9f01a67250b39c6ad10c (diff) | |
Major code cleanup following the pg_password insertion...
...malloc/free -> palloc/pfree
...fopen/fclose -> AllocateFile/FreeFile
Diffstat (limited to 'src/backend/postmaster')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 7201d0a6d99..2e62d101362 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.64 1997/12/07 20:57:45 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.65 1997/12/09 03:11:08 scrappy Exp $ * * NOTES * @@ -88,6 +88,7 @@ #include "storage/proc.h" #include "utils/elog.h" #include "port-protos.h" /* For gethostname() */ +#include "storage/fd.h" #if defined(DBX_VERSION) #define FORK() (0) @@ -228,7 +229,7 @@ checkDataDir(const char *DataDir, bool *DataDirOK) sprintf(path, "%s%cbase%ctemplate1%cpg_class", DataDir, SEP_CHAR, SEP_CHAR, SEP_CHAR); - fp = fopen(path, "r"); + fp = AllocateFile(path, "r"); if (fp == NULL) { fprintf(stderr, "%s does not find the database system. " @@ -244,7 +245,7 @@ checkDataDir(const char *DataDir, bool *DataDirOK) /* reason ValidatePgVersion failed. NULL if didn't */ - fclose(fp); + FreeFile(fp); ValidatePgVersion(DataDir, &reason); if (reason) |