diff options
| author | Peter Eisentraut | 2024-05-17 09:23:08 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2024-05-17 09:44:26 +0000 |
| commit | 17974ec259463869bb6bb4885d46847422fbc9ec (patch) | |
| tree | 11cd393058415b42093277f2e15de7bf1e186579 /src/backend/libpq | |
| parent | be5942aee7a012ce7f30bc7a6617903127f29e89 (diff) | |
Revise GUC names quoting in messages again
After further review, we want to move in the direction of always
quoting GUC names in error messages, rather than the previous (PG16)
wildly mixed practice or the intermittent (mid-PG17) idea of doing
this depending on how possibly confusing the GUC name is.
This commit applies appropriate quotes to (almost?) all mentions of
GUC names in error messages. It partially supersedes a243569bf65 and
8d9978a7176, which had moved things a bit in the opposite direction
but which then were abandoned in a partial state.
Author: Peter Smith <smithpb2250@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/CAHut%2BPv-kSN8SkxSdoHano_wPubqcg5789ejhCDZAcLFceBR-w%40mail.gmail.com
Diffstat (limited to 'src/backend/libpq')
| -rw-r--r-- | src/backend/libpq/be-secure-openssl.c | 4 | ||||
| -rw-r--r-- | src/backend/libpq/hba.c | 2 | ||||
| -rw-r--r-- | src/backend/libpq/pqcomm.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c index 60cf68aac4a..0caad6bed3d 100644 --- a/src/backend/libpq/be-secure-openssl.c +++ b/src/backend/libpq/be-secure-openssl.c @@ -201,7 +201,7 @@ be_tls_init(bool isServerStart) { ereport(isServerStart ? FATAL : LOG, /*- translator: first %s is a GUC option name, second %s is its value */ - (errmsg("%s setting \"%s\" not supported by this build", + (errmsg("\"%s\" setting \"%s\" not supported by this build", "ssl_min_protocol_version", GetConfigOption("ssl_min_protocol_version", false, false)))); @@ -251,7 +251,7 @@ be_tls_init(bool isServerStart) { ereport(isServerStart ? FATAL : LOG, (errmsg("could not set SSL protocol version range"), - errdetail("%s cannot be higher than %s", + errdetail("\"%s\" cannot be higher than \"%s\"", "ssl_min_protocol_version", "ssl_max_protocol_version"))); goto error; diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index d506c3c0b75..18271def2e8 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -1378,7 +1378,7 @@ parse_hba_line(TokenizedAuthLine *tok_line, int elevel) ereport(elevel, (errcode(ERRCODE_CONFIG_FILE_ERROR), errmsg("hostssl record cannot match because SSL is disabled"), - errhint("Set ssl = on in postgresql.conf."), + errhint("Set \"ssl = on\" in postgresql.conf."), errcontext("line %d of configuration file \"%s\"", line_num, file_name))); *err_msg = "hostssl record cannot match because SSL is disabled"; diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index 2cee49a2085..daa0696146d 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -731,7 +731,7 @@ Setup_AF_UNIX(const char *sock_path) if (Unix_socket_group[0] != '\0') { #ifdef WIN32 - elog(WARNING, "configuration item unix_socket_group is not supported on this platform"); + elog(WARNING, "configuration item \"unix_socket_group\" is not supported on this platform"); #else char *endptr; unsigned long val; |