aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2003-07-28 00:14:43 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2003-07-28 00:14:43 +0000
commit02d79e765b5e15b433e5f93427a3c864b6a7d526 (patch)
tree3c4abe8c15af6b023ee777a3726c7bf8a4ce3439 /src
parent81b5c8a1364e7d287fb0aaac848f7f84e64b86d3 (diff)
downloadpostgresql-02d79e765b5e15b433e5f93427a3c864b6a7d526.tar.gz
postgresql-02d79e765b5e15b433e5f93427a3c864b6a7d526.zip
Rename psql's VERBOSE variable to VERBOSITY, per suggestion from Bruce.
Diffstat (limited to 'src')
-rw-r--r--src/bin/psql/command.c14
-rw-r--r--src/bin/psql/command.h4
-rw-r--r--src/bin/psql/startup.c4
3 files changed, 11 insertions, 11 deletions
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index a406a1a8b58..cc1c20bd119 100644
--- 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 ead859cd32c..20e7efd2e2c 100644
--- 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 d4b9d433935..ab33c7f4174 100644
--- 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)));