summaryrefslogtreecommitdiff
path: root/src/interfaces/libpq/fe-connect.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2012-07-02 21:12:46 +0300
committerPeter Eisentraut <peter_e@gmx.net>2012-07-02 21:12:46 +0300
commit2b44306315cf84479f735b12f78499616172dbb9 (patch)
tree96ae8a6b3c42cd1791b70f32fb6a0de93fceaac3 /src/interfaces/libpq/fe-connect.c
parent41f4a0ab789463971add986dbc778d77ec5a0ef4 (diff)
downloadpostgresql-2b44306315cf84479f735b12f78499616172dbb9.tar.gz
Assorted message style improvements
Diffstat (limited to 'src/interfaces/libpq/fe-connect.c')
-rw-r--r--src/interfaces/libpq/fe-connect.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 7c9fa34560..a32258a8cb 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -4651,14 +4651,14 @@ conninfo_uri_parse_options(PQconninfoOption *options, const char *uri,
if (!*p)
{
printfPQExpBuffer(errorMessage,
- libpq_gettext("end of string reached when looking for matching ']' in IPv6 host address in URI: %s\n"),
+ libpq_gettext("end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\"\n"),
uri);
goto cleanup;
}
if (p == host)
{
printfPQExpBuffer(errorMessage,
- libpq_gettext("IPv6 host address may not be empty in URI: %s\n"),
+ libpq_gettext("IPv6 host address may not be empty in URI: \"%s\"\n"),
uri);
goto cleanup;
}
@@ -4673,7 +4673,7 @@ conninfo_uri_parse_options(PQconninfoOption *options, const char *uri,
if (*p && *p != ':' && *p != '/' && *p != '?')
{
printfPQExpBuffer(errorMessage,
- libpq_gettext("unexpected '%c' at position %d in URI (expecting ':' or '/'): %s\n"),
+ libpq_gettext("unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\"\n"),
*p, (int) (p - buf + 1), uri);
goto cleanup;
}
@@ -4787,7 +4787,7 @@ conninfo_uri_parse_params(char *params,
if (value != NULL)
{
printfPQExpBuffer(errorMessage,
- libpq_gettext("extra key/value separator '=' in URI query parameter: %s\n"),
+ libpq_gettext("extra key/value separator \"=\" in URI query parameter: \"%s\"\n"),
params);
return false;
}
@@ -4807,7 +4807,7 @@ conninfo_uri_parse_params(char *params,
if (value == NULL)
{
printfPQExpBuffer(errorMessage,
- libpq_gettext("missing key/value separator '=' in URI query parameter: %s\n"),
+ libpq_gettext("missing key/value separator \"=\" in URI query parameter: \"%s\"\n"),
params);
return false;
}
@@ -4878,7 +4878,7 @@ conninfo_uri_parse_params(char *params,
printfPQExpBuffer(errorMessage,
libpq_gettext(
- "invalid URI query parameter \"%s\"\n"),
+ "invalid URI query parameter: \"%s\"\n"),
keyword);
return false;
}
@@ -4943,7 +4943,7 @@ conninfo_uri_decode(const char *str, PQExpBuffer errorMessage)
if (!(get_hexdigit(*q++, &hi) && get_hexdigit(*q++, &lo)))
{
printfPQExpBuffer(errorMessage,
- libpq_gettext("invalid percent-encoded token: %s\n"),
+ libpq_gettext("invalid percent-encoded token: \"%s\"\n"),
str);
free(buf);
return NULL;
@@ -4953,7 +4953,7 @@ conninfo_uri_decode(const char *str, PQExpBuffer errorMessage)
if (c == 0)
{
printfPQExpBuffer(errorMessage,
- libpq_gettext("forbidden value %%00 in percent-encoded value: %s\n"),
+ libpq_gettext("forbidden value %%00 in percent-encoded value: \"%s\"\n"),
str);
free(buf);
return NULL;