Remove unused 'noversion' command-line option processing from the

Neil Conway · Neil Conway · commit 030f8e731326 · 2004-01-06T17:36:31.000Z
backend.
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.381 2003/12/25 03:52:51 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.382 2004/01/06 17:36:31 neilc Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -2073,7 +2073,6 @@ PostgresMain(int argc, char *argv[], const char *username)
 	/*
 	 * Set default values for command-line options.
 	 */
-	Noversion = false;
 	EchoQuery = false;
 
 	if (!IsUnderPostmaster)
@@ -2104,7 +2103,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	ctx = debug_context = PGC_POSTMASTER;
 	gucsource = PGC_S_ARGV;		/* initial switches came from command line */
 
-	while ((flag = getopt(argc, argv, "A:B:c:CD:d:Eef:FiNOPo:p:S:st:v:W:x:-:")) != -1)
+	while ((flag = getopt(argc, argv, "A:B:c:D:d:Eef:FiNOPo:p:S:st:v:W:x:-:")) != -1)
 		switch (flag)
 		{
 			case 'A':
@@ -2125,14 +2124,6 @@ PostgresMain(int argc, char *argv[], const char *username)
 				SetConfigOption("shared_buffers", optarg, ctx, gucsource);
 				break;
 
-			case 'C':
-
-				/*
-				 * don't print version string
-				 */
-				Noversion = true;
-				break;
-
 			case 'D':			/* PGDATA directory */
 				if (secure)
 					potential_DataDir = optarg;
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/init/globals.c,v 1.76 2003/11/29 19:52:01 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/init/globals.c,v 1.77 2004/01/06 17:36:31 neilc Exp $
  *
  * NOTES
  *	  Globals used all over the place should be declared here and not
@@ -25,8 +25,6 @@
 
 ProtocolVersion FrontendProtocol = PG_PROTOCOL_LATEST;
 
-bool		Noversion = false;
-
 volatile bool InterruptPending = false;
 volatile bool QueryCancelPending = false;
 volatile bool ProcDiePending = false;
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.140 2003/12/21 04:34:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.141 2004/01/06 17:36:31 neilc Exp $
  *
  * NOTES
  *	  some of the information in this file should be moved to
@@ -125,7 +125,6 @@ extern bool IsUnderPostmaster;
 
 extern bool ExitOnAnyError;
 
-extern bool Noversion;
 extern char *DataDir;
 
 extern DLLIMPORT int MyProcPid;

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/init/globals.c,v 1.76 2003/11/29 19:52:01 pgsql Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/init/globals.c,v 1.77 2004/01/06 17:36:31 neilc Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* Globals used all over the place should be declared here and not`
`@@ -25,8 +25,6 @@`
`25`	`25`
`26`	`26`	`ProtocolVersion FrontendProtocol = PG_PROTOCOL_LATEST;`
`27`	`27`
`28`		`-bool Noversion = false;`
`29`		`-`
`30`	`28`	`volatile bool InterruptPending = false;`
`31`	`29`	`volatile bool QueryCancelPending = false;`
`32`	`30`	`volatile bool ProcDiePending = false;`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`13`	`13`	`* Portions Copyright (c) 1994, Regents of the University of California`
`14`	`14`	`*`
`15`		`- * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.140 2003/12/21 04:34:35 momjian Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.141 2004/01/06 17:36:31 neilc Exp $`
`16`	`16`	`*`
`17`	`17`	`* NOTES`
`18`	`18`	`* some of the information in this file should be moved to`
`@@ -125,7 +125,6 @@ extern bool IsUnderPostmaster;`
`125`	`125`
`126`	`126`	`extern bool ExitOnAnyError;`
`127`	`127`
`128`		`-extern bool Noversion;`
`129`	`128`	`extern char *DataDir;`
`130`	`129`
`131`	`130`	`extern DLLIMPORT int MyProcPid;`