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

Commit009a6c9

Browse files
committed
Remove GUC extra_desc strings that are redundant with the enum value lists.
1 parent03c4e79 commit009a6c9

File tree

1 file changed

+19
-21
lines changed
  • src/backend/utils/misc

1 file changed

+19
-21
lines changed

‎src/backend/utils/misc/guc.c

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.460 2008/07/0106:36:11 mha Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.461 2008/07/0121:07:33 tgl Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -212,8 +212,8 @@ static const struct config_enum_entry server_message_level_options[] = {
212212
};
213213

214214
staticconststructconfig_enum_entrylog_error_verbosity_options[]= {
215-
{"default",PGERROR_DEFAULT, false},
216215
{"terse",PGERROR_TERSE, false},
216+
{"default",PGERROR_DEFAULT, false},
217217
{"verbose",PGERROR_VERBOSE, false},
218218
{NULL,0, false}
219219
};
@@ -1355,7 +1355,7 @@ static struct config_int ConfigureNamesInt[] =
13551355
{"unix_socket_permissions",PGC_POSTMASTER,CONN_AUTH_SETTINGS,
13561356
gettext_noop("Sets the access permissions of the Unix-domain socket."),
13571357
gettext_noop("Unix-domain sockets use the usual Unix file system "
1358-
"permission set. The parameter value is expected to bean numeric mode "
1358+
"permission set. The parameter value is expected to bea numeric mode "
13591359
"specification in the form accepted by the chmod and umask system "
13601360
"calls. (To use the customary octal format the number must start with "
13611361
"a 0 (zero).)")
@@ -2323,7 +2323,7 @@ static struct config_string ConfigureNamesString[] =
23232323
{
23242324
{"timezone_abbreviations",PGC_USERSET,CLIENT_CONN_LOCALE,
23252325
gettext_noop("Selects a file of time zone abbreviations."),
2326-
NULL,
2326+
NULL
23272327
},
23282328
&timezone_abbreviations_string,
23292329
"UNKNOWN",assign_timezone_abbreviations,NULL
@@ -2462,7 +2462,7 @@ static struct config_enum ConfigureNamesEnum[] =
24622462
{
24632463
{"backslash_quote",PGC_USERSET,COMPAT_OPTIONS_PREVIOUS,
24642464
gettext_noop("Sets whether \"\\'\" is allowed in string literals."),
2465-
gettext_noop("Valid values are ON, OFF, and SAFE_ENCODING.")
2465+
NULL
24662466
},
24672467
&backslash_quote,
24682468
BACKSLASH_QUOTE_SAFE_ENCODING,backslash_quote_options,NULL,NULL
@@ -2475,14 +2475,13 @@ static struct config_enum ConfigureNamesEnum[] =
24752475
" the level, the fewer messages are sent.")
24762476
},
24772477
&client_min_messages,
2478-
NOTICE,client_message_level_options,NULL,NULL
2478+
NOTICE,client_message_level_options,NULL,NULL
24792479
},
24802480

24812481
{
24822482
{"default_transaction_isolation",PGC_USERSET,CLIENT_CONN_STATEMENT,
24832483
gettext_noop("Sets the transaction isolation level of each new transaction."),
2484-
gettext_noop("Each SQL transaction has an isolation level, which "
2485-
"can be either \"read uncommitted\", \"read committed\", \"repeatable read\", or \"serializable\".")
2484+
NULL
24862485
},
24872486
&DefaultXactIsoLevel,
24882487
XACT_READ_COMMITTED,isolation_level_options,NULL,NULL
@@ -2491,7 +2490,7 @@ static struct config_enum ConfigureNamesEnum[] =
24912490
{
24922491
{"log_error_verbosity",PGC_SUSET,LOGGING_WHEN,
24932492
gettext_noop("Sets the verbosity of logged messages."),
2494-
gettext_noop("Valid values are \"terse\", \"default\", and \"verbose\".")
2493+
NULL
24952494
},
24962495
&Log_error_verbosity,
24972496
PGERROR_DEFAULT,log_error_verbosity_options,NULL,NULL
@@ -2500,7 +2499,8 @@ static struct config_enum ConfigureNamesEnum[] =
25002499
{
25012500
{"log_min_messages",PGC_SUSET,LOGGING_WHEN,
25022501
gettext_noop("Sets the message levels that are logged."),
2503-
gettext_noop("Each level includes all levels that follow it.")
2502+
gettext_noop("Each level includes all the levels that follow it. The later"
2503+
" the level, the fewer messages are sent.")
25042504
},
25052505
&log_min_messages,
25062506
WARNING,server_message_level_options,NULL,NULL
@@ -2509,8 +2509,8 @@ static struct config_enum ConfigureNamesEnum[] =
25092509
{
25102510
{"log_min_error_statement",PGC_SUSET,LOGGING_WHEN,
25112511
gettext_noop("Causes all statements generating error at or above this level to be logged."),
2512-
gettext_noop("All SQL statements that cause an error of the"
2513-
"specifiedlevel or a higher levelarelogged.")
2512+
gettext_noop("Each level includes all the levels that follow it. The later"
2513+
" thelevel, the fewer messagesaresent.")
25142514
},
25152515
&log_min_error_statement,
25162516
ERROR,server_message_level_options,NULL,NULL
@@ -2519,7 +2519,7 @@ static struct config_enum ConfigureNamesEnum[] =
25192519
{
25202520
{"log_statement",PGC_SUSET,LOGGING_WHAT,
25212521
gettext_noop("Sets the type of statements logged."),
2522-
gettext_noop("Valid values are \"none\", \"ddl\", \"mod\", and \"all\".")
2522+
NULL
25232523
},
25242524
&log_statement,
25252525
LOGSTMT_NONE,log_statement_options,NULL,NULL
@@ -2529,8 +2529,7 @@ static struct config_enum ConfigureNamesEnum[] =
25292529
{
25302530
{"syslog_facility",PGC_SIGHUP,LOGGING_WHERE,
25312531
gettext_noop("Sets the syslog \"facility\" to be used when syslog enabled."),
2532-
gettext_noop("Valid values are LOCAL0, LOCAL1, LOCAL2, LOCAL3, "
2533-
"LOCAL4, LOCAL5, LOCAL6, LOCAL7.")
2532+
NULL
25342533
},
25352534
&syslog_facility,
25362535
LOG_LOCAL0,syslog_facility_options,assign_syslog_facility,NULL
@@ -2540,7 +2539,7 @@ static struct config_enum ConfigureNamesEnum[] =
25402539
{
25412540
{"regex_flavor",PGC_USERSET,COMPAT_OPTIONS_PREVIOUS,
25422541
gettext_noop("Sets the regular expression \"flavor\"."),
2543-
gettext_noop("This can be set to advanced, extended, or basic.")
2542+
NULL
25442543
},
25452544
&regex_flavor,
25462545
REG_ADVANCED,regex_flavor_options,NULL,NULL
@@ -2549,8 +2548,7 @@ static struct config_enum ConfigureNamesEnum[] =
25492548
{
25502549
{"session_replication_role",PGC_SUSET,CLIENT_CONN_STATEMENT,
25512550
gettext_noop("Sets the session's behavior for triggers and rewrite rules."),
2552-
gettext_noop("Each session can be either"
2553-
" \"origin\", \"replica\", or \"local\".")
2551+
NULL
25542552
},
25552553
&SessionReplicationRole,
25562554
SESSION_REPLICATION_ROLE_ORIGIN,session_replication_role_options,
@@ -2560,7 +2558,7 @@ static struct config_enum ConfigureNamesEnum[] =
25602558
{
25612559
{"track_functions",PGC_SUSET,STATS_COLLECTOR,
25622560
gettext_noop("Collects function-level statistics on database activity."),
2563-
gettext_noop("Valid values are: NONE, PL, and ALL.")
2561+
NULL
25642562
},
25652563
&pgstat_track_functions,
25662564
TRACK_FUNC_OFF,track_function_options,NULL,NULL
@@ -2579,7 +2577,7 @@ static struct config_enum ConfigureNamesEnum[] =
25792577
{
25802578
{"xmlbinary",PGC_USERSET,CLIENT_CONN_STATEMENT,
25812579
gettext_noop("Sets how binary values are to be encoded in XML."),
2582-
gettext_noop("Valid values are BASE64 and HEX.")
2580+
NULL
25832581
},
25842582
&xmlbinary,
25852583
XMLBINARY_BASE64,xmlbinary_options,NULL,NULL
@@ -2589,7 +2587,7 @@ static struct config_enum ConfigureNamesEnum[] =
25892587
{"xmloption",PGC_USERSET,CLIENT_CONN_STATEMENT,
25902588
gettext_noop("Sets whether XML data in implicit parsing and serialization "
25912589
"operations is to be considered as documents or content fragments."),
2592-
gettext_noop("Valid values are DOCUMENT and CONTENT.")
2590+
NULL
25932591
},
25942592
&xmloption,
25952593
XMLOPTION_CONTENT,xmloption_options,NULL,NULL

0 commit comments

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