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

tglsfdc · tglsfdc · commit 02d79e765b5e · 2003-07-28T00:14:43.000Z
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.92 2003/07/27 03:32:26 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.93 2003/07/28 00:14:42 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -2066,7 +2066,7 @@ bar
       </varlistentry>
 
       <varlistentry>
-        <term><varname>VERBOSE</varname></term>
+        <term><varname>VERBOSITY</varname></term>
 	<listitem>
 	<para>
 	This variable can be set to the values <literal>default</>,
diff --git 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
@@ -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
@@ -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)));
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000-2002 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.98 2003/07/23 08:47:38 petere Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.99 2003/07/28 00:14:42 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "command.h"`
`@@ -707,8 +707,8 @@ exec_command(const char *cmd,`
`707`	`707`	`if (SetVariable(pset.vars, opt0, newval))`
`708`	`708`	`{`
`709`	`709`	`/* Check for special variables */`
`710`		`- if (strcmp(opt0, "VERBOSE") == 0)`
`711`		`- SyncVerboseVariable();`
	`710`	`+ if (strcmp(opt0, "VERBOSITY") == 0)`
	`711`	`+ SyncVerbosityVariable();`
`712`	`712`	`}`
`713`	`713`	`else`
`714`	`714`	`{`
`@@ -1469,7 +1469,7 @@ SyncVariables(void)`
`1469`	`1469`	`SetVariable(pset.vars, "ENCODING", pg_encoding_to_char(pset.encoding));`
`1470`	`1470`
`1471`	`1471`	`/* send stuff to it, too */`
`1472`		`- SyncVerboseVariable();`
	`1472`	`+ SyncVerbosityVariable();`
`1473`	`1473`	`}`
`1474`	`1474`
`1475`	`1475`	`/*`
`@@ -1488,12 +1488,12 @@ UnsyncVariables(void)`
`1488`	`1488`	`}`
`1489`	`1489`
`1490`	`1490`	`/*`
`1491`		`- * Update connection state from VERBOSE variable`
	`1491`	`+ * Update connection state from VERBOSITY variable`
`1492`	`1492`	`*/`
`1493`	`1493`	`void`
`1494`		`-SyncVerboseVariable(void)`
	`1494`	`+SyncVerbosityVariable(void)`
`1495`	`1495`	`{`
`1496`		`- switch (SwitchVariable(pset.vars, "VERBOSE",`
	`1496`	`+ switch (SwitchVariable(pset.vars, "VERBOSITY",`
`1497`	`1497`	`"default", "terse", "verbose", NULL))`
`1498`	`1498`	`{`
`1499`	`1499`	`case 1: /* default */`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.15 2003/06/28 00:12:40 tgl Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.16 2003/07/28 00:14:43 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#ifndef COMMAND_H`
`9`	`9`	`#define COMMAND_H`
`@@ -42,6 +42,6 @@ extern void SyncVariables(void);`
`42`	`42`
`43`	`43`	`extern void UnsyncVariables(void);`
`44`	`44`
`45`		`-extern void SyncVerboseVariable(void);`
	`45`	`+extern void SyncVerbosityVariable(void);`
`46`	`46`
`47`	`47`	`#endif /* COMMAND_H */`