Rename psql's VERBOSE variable to VERBOSITY, per suggestion from Bruce.

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 9e9c60ecc4706ecdc3bd0be92d00c89aceba8b27..306f40f35306b169ceb1a1ef3d4dd2fd6e122f00 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 
 
@@ -2066,7 +2066,7 @@ bar
       
 
       
-        VERBOSE
+        VERBOSITY
    
    
    This variable can be set to the values default,

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index a406a1a8b583cc6b3b71466e738cdcf6a26768e6..cc1c20bd1198a8b2d871969f717fc8e6e68d8084 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000-2002 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.98 2003/07/23 08:47:38 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.99 2003/07/28 00:14:42 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "command.h"
@@ -707,8 +707,8 @@ exec_command(const char *cmd,
            if (SetVariable(pset.vars, opt0, newval))
            {
                /* Check for special variables */
-               if (strcmp(opt0, "VERBOSE") == 0)
-                   SyncVerboseVariable();
+               if (strcmp(opt0, "VERBOSITY") == 0)
+                   SyncVerbosityVariable();
            }
            else
            {
@@ -1469,7 +1469,7 @@ SyncVariables(void)
    SetVariable(pset.vars, "ENCODING", pg_encoding_to_char(pset.encoding));
 
    /* send stuff to it, too */
-   SyncVerboseVariable();
+   SyncVerbosityVariable();
 }
 
 /*
@@ -1488,12 +1488,12 @@ UnsyncVariables(void)
 }
 
 /*
- * Update connection state from VERBOSE variable
+ * Update connection state from VERBOSITY variable
  */
 void
-SyncVerboseVariable(void)
+SyncVerbosityVariable(void)
 {
-   switch (SwitchVariable(pset.vars, "VERBOSE",
+   switch (SwitchVariable(pset.vars, "VERBOSITY",
                           "default", "terse", "verbose", NULL))
    {
        case 1:                 /* default */

diff --git a/src/bin/psql/command.h b/src/bin/psql/command.h
index ead859cd32c83d2d49940d35da47b87e2e9e4a3d..20e7efd2e2cf13450e1458a9955096058bf0fe7e 100644 (file)
--- a/src/bin/psql/command.h
+++ b/src/bin/psql/command.h
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.15 2003/06/28 00:12:40 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.16 2003/07/28 00:14:43 tgl Exp $
  */
 #ifndef COMMAND_H
 #define COMMAND_H
@@ -42,6 +42,6 @@ extern void SyncVariables(void);
 
 extern void UnsyncVariables(void);
 
-extern void SyncVerboseVariable(void);
+extern void SyncVerbosityVariable(void);
 
 #endif   /* COMMAND_H */

diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index d4b9d433935097922c69013aed9cab023aacbbda..ab33c7f4174d1d1be1e4597cdbe9b080d364f223 100644 (file)
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.75 2003/07/23 08:47:40 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.76 2003/07/28 00:14:43 tgl Exp $
  */
 #include "postgres_fe.h"
 
@@ -141,7 +141,7 @@ main(int argc, char *argv[])
 
    /* Default values for variables that are used in noninteractive cases */
    SetVariableBool(pset.vars, "AUTOCOMMIT");
-   SetVariable(pset.vars, "VERBOSE", "default");
+   SetVariable(pset.vars, "VERBOSITY", "default");
 
    pset.notty = (!isatty(fileno(stdin)) || !isatty(fileno(stdout)));