rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename miscadmin.h's PG_VERSIONSTR macro to PG_BACKEND_VERSIONSTR to 

make it a bit clearer what it is, and get rid of duplicate definitions
in initdb and pg_ctl.
This commit is contained in:
Tom Lane 2008-02-20 22:46:24 +00:00
parent 8dd6c4b4be
commit 870993e871
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/postmaster/postmaster.c
View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.551 2008/01/11 00:54:09 tgl Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.552 2008/02/20 22:46:24 tgl Exp $
* *
* NOTES * NOTES
* *
@ -665,7 +665,7 @@ PostmasterMain(int argc, char *argv[])
#ifdef EXEC_BACKEND #ifdef EXEC_BACKEND
/* Locate executable backend before we change working directory */ /* Locate executable backend before we change working directory */
if (find_other_exec(argv[0], "postgres", PG_VERSIONSTR, if (find_other_exec(argv[0], "postgres", PG_BACKEND_VERSIONSTR,
postgres_exec_path) < 0) postgres_exec_path) < 0)
ereport(FATAL, ereport(FATAL,
(errmsg("%s: could not locate matching postgres executable", (errmsg("%s: could not locate matching postgres executable",

7
src/bin/initdb/initdb.c
View File

@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * Portions taken from FreeBSD.
* *
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.152 2008/01/01 19:45:55 momjian Exp $ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.153 2008/02/20 22:46:24 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -67,9 +67,6 @@ int optreset;
#endif #endif
/* version string we expect back from postgres */
#define PG_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
/* /*
* these values are passed in by makefile defines * these values are passed in by makefile defines
*/ */
@ -2666,7 +2663,7 @@ main(int argc, char *argv[])
sprintf(pgdenv, "PGDATA=%s", pg_data); sprintf(pgdenv, "PGDATA=%s", pg_data);
putenv(pgdenv); putenv(pgdenv);
if ((ret = find_other_exec(argv[0], "postgres", PG_VERSIONSTR, if ((ret = find_other_exec(argv[0], "postgres", PG_BACKEND_VERSIONSTR,
backend_exec)) < 0) backend_exec)) < 0)
{ {
char full_path[MAXPGPATH]; char full_path[MAXPGPATH];

12
src/bin/pg_ctl/pg_ctl.c
View File

@ -4,7 +4,7 @@
* *
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.93 2008/02/20 22:18:15 tgl Exp $ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.94 2008/02/20 22:46:24 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -33,6 +33,7 @@
#include "libpq/pqsignal.h" #include "libpq/pqsignal.h"
#include "getopt_long.h" #include "getopt_long.h"
#include "miscadmin.h"
#if defined(__CYGWIN__) #if defined(__CYGWIN__)
#include <sys/cygwin.h> #include <sys/cygwin.h>
@ -49,10 +50,6 @@ int optreset;
typedef long pgpid_t; typedef long pgpid_t;
/* postgres version ident string */
#define PM_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
typedef enum typedef enum
{ {
SMART_MODE, SMART_MODE,
@ -659,7 +656,7 @@ do_start(void)
postmaster_path = pg_malloc(MAXPGPATH); postmaster_path = pg_malloc(MAXPGPATH);
if ((ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR, if ((ret = find_other_exec(argv0, "postgres", PG_BACKEND_VERSIONSTR,
postmaster_path)) < 0) postmaster_path)) < 0)
{ {
char full_path[MAXPGPATH]; char full_path[MAXPGPATH];
@ -1020,7 +1017,8 @@ pgwin32_CommandLine(bool registration)
} }
else else
{ {
ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR, cmdLine); ret = find_other_exec(argv0, "postgres", PG_BACKEND_VERSIONSTR,
cmdLine);
if (ret != 0) if (ret != 0)
{ {
write_stderr(_("%s: could not find postgres program executable\n"), progname); write_stderr(_("%s: could not find postgres program executable\n"), progname);

4
src/include/miscadmin.h
View File

@ -13,7 +13,7 @@
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.200 2008/02/17 02:09:31 tgl Exp $ * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.201 2008/02/20 22:46:24 tgl Exp $
* *
* NOTES * NOTES
* some of the information in this file should be moved to other files. * some of the information in this file should be moved to other files.
@ -26,7 +26,7 @@
#include "pgtime.h" /* for pg_time_t */ #include "pgtime.h" /* for pg_time_t */
#define PG_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n" #define PG_BACKEND_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
/***************************************************************************** /*****************************************************************************