diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2021-04-23 14:18:11 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2021-04-23 14:21:37 +0200 |
| commit | 82c3cd974131d7fa1cfcd07cebfb04fffe26ee35 (patch) | |
| tree | 5e165fd8be0892ede2d4591ad32b559794fce887 /src/interfaces/libpq/fe-connect.c | |
| parent | 9486844f301e265a3ad11b612decaba2462c3c15 (diff) | |
Factor out system call names from error messages
Instead, put them in via a format placeholder. This reduces the
number of distinct translatable messages and also reduces the chances
of typos during translation. We already did this for the system call
arguments in a number of cases, so this is just the same thing taken a
bit further.
Discussion: https://www.postgresql.org/message-id/flat/92d6f545-5102-65d8-3c87-489f71ea0a37%40enterprisedb.com
Diffstat (limited to 'src/interfaces/libpq/fe-connect.c')
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 96b9edf1256..5a57c9d75b4 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -1863,7 +1863,8 @@ setKeepalivesIdle(PGconn *conn) char sebuf[PG_STRERROR_R_BUFLEN]; appendPQExpBuffer(&conn->errorMessage, - libpq_gettext("setsockopt(%s) failed: %s\n"), + libpq_gettext("%s(%s) failed: %s\n"), + "setsockopt", PG_TCP_KEEPALIVE_IDLE_STR, SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf))); return 0; @@ -1897,7 +1898,8 @@ setKeepalivesInterval(PGconn *conn) char sebuf[PG_STRERROR_R_BUFLEN]; appendPQExpBuffer(&conn->errorMessage, - libpq_gettext("setsockopt(%s) failed: %s\n"), + libpq_gettext("%s(%s) failed: %s\n"), + "setsockopt", "TCP_KEEPINTVL", SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf))); return 0; @@ -1932,7 +1934,8 @@ setKeepalivesCount(PGconn *conn) char sebuf[PG_STRERROR_R_BUFLEN]; appendPQExpBuffer(&conn->errorMessage, - libpq_gettext("setsockopt(%s) failed: %s\n"), + libpq_gettext("%s(%s) failed: %s\n"), + "setsockopt", "TCP_KEEPCNT", SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf))); return 0; @@ -2019,7 +2022,8 @@ setTCPUserTimeout(PGconn *conn) char sebuf[256]; appendPQExpBuffer(&conn->errorMessage, - libpq_gettext("setsockopt(%s) failed: %s\n"), + libpq_gettext("%s(%s) failed: %s\n"), + "setsockopt", "TCP_USER_TIMEOUT", SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf))); return 0; @@ -2632,7 +2636,8 @@ keep_going: /* We will come back to here until there is (char *) &on, sizeof(on)) < 0) { appendPQExpBuffer(&conn->errorMessage, - libpq_gettext("setsockopt(%s) failed: %s\n"), + libpq_gettext("%s(%s) failed: %s\n"), + "setsockopt", "SO_KEEPALIVE", SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf))); err = 1; |