Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit02d79e7

Browse files
committed
Rename psql's VERBOSE variable to VERBOSITY, per suggestion from Bruce.
1 parent81b5c8a commit02d79e7

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

‎doc/src/sgml/ref/psql-ref.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.92 2003/07/27 03:32:26 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.93 2003/07/28 00:14:42 tgl Exp $
33
PostgreSQL documentation
44
-->
55

@@ -2066,7 +2066,7 @@ bar
20662066
</varlistentry>
20672067

20682068
<varlistentry>
2069-
<term><varname>VERBOSE</varname></term>
2069+
<term><varname>VERBOSITY</varname></term>
20702070
<listitem>
20712071
<para>
20722072
This variable can be set to the values <literal>default</>,

‎src/bin/psql/command.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000-2002 by PostgreSQL Global Development Group
55
*
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 $
77
*/
88
#include"postgres_fe.h"
99
#include"command.h"
@@ -707,8 +707,8 @@ exec_command(const char *cmd,
707707
if (SetVariable(pset.vars,opt0,newval))
708708
{
709709
/* Check for special variables */
710-
if (strcmp(opt0,"VERBOSE")==0)
711-
SyncVerboseVariable();
710+
if (strcmp(opt0,"VERBOSITY")==0)
711+
SyncVerbosityVariable();
712712
}
713713
else
714714
{
@@ -1469,7 +1469,7 @@ SyncVariables(void)
14691469
SetVariable(pset.vars,"ENCODING",pg_encoding_to_char(pset.encoding));
14701470

14711471
/* send stuff to it, too */
1472-
SyncVerboseVariable();
1472+
SyncVerbosityVariable();
14731473
}
14741474

14751475
/*
@@ -1488,12 +1488,12 @@ UnsyncVariables(void)
14881488
}
14891489

14901490
/*
1491-
* Update connection state fromVERBOSE variable
1491+
* Update connection state fromVERBOSITY variable
14921492
*/
14931493
void
1494-
SyncVerboseVariable(void)
1494+
SyncVerbosityVariable(void)
14951495
{
1496-
switch (SwitchVariable(pset.vars,"VERBOSE",
1496+
switch (SwitchVariable(pset.vars,"VERBOSITY",
14971497
"default","terse","verbose",NULL))
14981498
{
14991499
case1:/* default */

‎src/bin/psql/command.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
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 $
77
*/
88
#ifndefCOMMAND_H
99
#defineCOMMAND_H
@@ -42,6 +42,6 @@ extern void SyncVariables(void);
4242

4343
externvoidUnsyncVariables(void);
4444

45-
externvoidSyncVerboseVariable(void);
45+
externvoidSyncVerbosityVariable(void);
4646

4747
#endif/* COMMAND_H */

‎src/bin/psql/startup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.75 2003/07/23 08:47:40 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.76 2003/07/28 00:14:43 tgl Exp $
77
*/
88
#include"postgres_fe.h"
99

@@ -141,7 +141,7 @@ main(int argc, char *argv[])
141141

142142
/* Default values for variables that are used in noninteractive cases */
143143
SetVariableBool(pset.vars,"AUTOCOMMIT");
144-
SetVariable(pset.vars,"VERBOSE","default");
144+
SetVariable(pset.vars,"VERBOSITY","default");
145145

146146
pset.notty= (!isatty(fileno(stdin))|| !isatty(fileno(stdout)));
147147

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp