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

backend.

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index c7252637e943e7b952a2a916f28484388425cdc1..6d32675674abb642972318cd4df8f3dfef17c48d 100644 (file)
--- 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
index b9606a5b46755c53489cbd9255194558b2e97099..72c9be43987989bfc5b873f3d48f4026cfe1c8f0 100644 (file)
--- 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
index 729c0049d93d2b084457c6a878d8e5439e1864f1..86fb2e03f4ae42ce8e060912f6f71a0fd9bb7c28 100644 (file)
--- 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;