Rename miscadmin.h's PG_VERSIONSTR macro to PG_BACKEND_VERSIONSTR to

tglsfdc · tglsfdc · commit 870993e8717f · 2008-02-20T22:46:24.000Z
make it a bit clearer what it is, and get rid of duplicate definitions
in initdb and pg_ctl.
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * 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
  *
@@ -665,7 +665,7 @@ PostmasterMain(int argc, char *argv[])
 
 #ifdef EXEC_BACKEND
 	/* 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)
 		ereport(FATAL,
 				(errmsg("%s: could not locate matching postgres executable",
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * 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
 
 
-/* version string we expect back from postgres */
-#define PG_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
-
 /*
  * these values are passed in by makefile defines
  */
@@ -2666,7 +2663,7 @@ main(int argc, char *argv[])
 	sprintf(pgdenv, "PGDATA=%s", pg_data);
 	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)
 	{
 		char		full_path[MAXPGPATH];
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * 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 "getopt_long.h"
+#include "miscadmin.h"
 
 #if defined(__CYGWIN__)
 #include <sys/cygwin.h>
@@ -49,10 +50,6 @@ int			optreset;
 typedef long pgpid_t;
 
 
-/* postgres version ident string */
-#define PM_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
-
-
 typedef enum
 {
 	SMART_MODE,
@@ -659,7 +656,7 @@ do_start(void)
 
 		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)
 		{
 			char		full_path[MAXPGPATH];
@@ -1020,7 +1017,8 @@ pgwin32_CommandLine(bool registration)
 	}
 	else
 	{
-		ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR, cmdLine);
+		ret = find_other_exec(argv0, "postgres", PG_BACKEND_VERSIONSTR,
+							  cmdLine);
 		if (ret != 0)
 		{
 			write_stderr(_("%s: could not find postgres program executable\n"), progname);
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * 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
  *	  some of the information in this file should be moved to other files.
@@ -26,7 +26,7 @@
 #include "pgtime.h"				/* for pg_time_t */
 
 
-#define PG_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
+#define PG_BACKEND_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
 
 
 /*****************************************************************************

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.551 2008/01/11 00:54:09 tgl Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.552 2008/02/20 22:46:24 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -665,7 +665,7 @@ PostmasterMain(int argc, char *argv[])`
`665`	`665`
`666`	`666`	`#ifdef EXEC_BACKEND`
`667`	`667`	`/* Locate executable backend before we change working directory */`
`668`		`- if (find_other_exec(argv[0], "postgres", PG_VERSIONSTR,`
	`668`	`+ if (find_other_exec(argv[0], "postgres", PG_BACKEND_VERSIONSTR,`
`669`	`669`	`postgres_exec_path) < 0)`
`670`	`670`	`ereport(FATAL,`
`671`	`671`	`(errmsg("%s: could not locate matching postgres executable",`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.93 2008/02/20 22:18:15 tgl Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.94 2008/02/20 22:46:24 tgl Exp $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -33,6 +33,7 @@`
`33`	`33`
`34`	`34`	`#include "libpq/pqsignal.h"`
`35`	`35`	`#include "getopt_long.h"`
	`36`	`+#include "miscadmin.h"`
`36`	`37`
`37`	`38`	`#if defined(__CYGWIN__)`
`38`	`39`	`#include <sys/cygwin.h>`
`@@ -49,10 +50,6 @@ int optreset;`
`49`	`50`	`typedef long pgpid_t;`
`50`	`51`
`51`	`52`
`52`		`-/* postgres version ident string */`
`53`		`-#define PM_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"`
`54`		`-`
`55`		`-`
`56`	`53`	`typedef enum`
`57`	`54`	`{`
`58`	`55`	`SMART_MODE,`
`@@ -659,7 +656,7 @@ do_start(void)`
`659`	`656`
`660`	`657`	`postmaster_path = pg_malloc(MAXPGPATH);`
`661`	`658`
`662`		`- if ((ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR,`
	`659`	`+ if ((ret = find_other_exec(argv0, "postgres", PG_BACKEND_VERSIONSTR,`
`663`	`660`	`postmaster_path)) < 0)`
`664`	`661`	`{`
`665`	`662`	`char full_path[MAXPGPATH];`
`@@ -1020,7 +1017,8 @@ pgwin32_CommandLine(bool registration)`
`1020`	`1017`	`}`
`1021`	`1018`	`else`
`1022`	`1019`	`{`
`1023`		`- ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR, cmdLine);`
	`1020`	`+ ret = find_other_exec(argv0, "postgres", PG_BACKEND_VERSIONSTR,`
	`1021`	`+ cmdLine);`
`1024`	`1022`	`if (ret != 0)`
`1025`	`1023`	`{`
`1026`	`1024`	`write_stderr(_("%s: could not find postgres program executable\n"), progname);`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group`
`14`	`14`	`* Portions Copyright (c) 1994, Regents of the University of California`
`15`	`15`	`*`
`16`		`- * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.200 2008/02/17 02:09:31 tgl Exp $`
	`16`	`+ * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.201 2008/02/20 22:46:24 tgl Exp $`
`17`	`17`	`*`
`18`	`18`	`* NOTES`
`19`	`19`	`* some of the information in this file should be moved to other files.`
`@@ -26,7 +26,7 @@`
`26`	`26`	`#include "pgtime.h" /* for pg_time_t */`
`27`	`27`
`28`	`28`
`29`		`-#define PG_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"`
	`29`	`+#define PG_BACKEND_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"`
`30`	`30`
`31`	`31`
`32`	`32`	`/*****************************************************************************`