database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-12 16:21:30 +03:00
Code

Fix redundant error messages in client tools

Browse Source 
A few client tools duplicate error messages already provided by libpq.

Discussion: https://www.postgresql.org/message-id/flat/3e937641-88a1-e697-612e-99bba4b8e5e4%40enterprisedb.com
This commit is contained in:
Peter Eisentraut 2020-11-07 22:15:52 +01:00
parent 8ad6a0c1bb
commit 16eadc4695
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/pg_basebackup/streamutil.c
View File

@ -201,8 +201,7 @@ GetConnection(void)
if (PQstatus(tmpconn) != CONNECTION_OK) if (PQstatus(tmpconn) != CONNECTION_OK)
{ {
pg_log_error("could not connect to server: %s", pg_log_error("%s", PQerrorMessage(tmpconn));
PQerrorMessage(tmpconn));
PQfinish(tmpconn); PQfinish(tmpconn);
free(values); free(values);
free(keywords); free(keywords);

3
src/bin/pg_rewind/libpq_fetch.c
View File

@ -49,8 +49,7 @@ libpqConnect(const char *connstr)
conn = PQconnectdb(connstr); conn = PQconnectdb(connstr);
if (PQstatus(conn) == CONNECTION_BAD) if (PQstatus(conn) == CONNECTION_BAD)
pg_fatal("could not connect to server: %s", pg_fatal("%s", PQerrorMessage(conn));
PQerrorMessage(conn));
if (showprogress) if (showprogress)
pg_log_info("connected to server"); pg_log_info("connected to server");

2
src/bin/psql/startup.c
View File

@ -300,7 +300,7 @@ main(int argc, char *argv[])
if (PQstatus(pset.db) == CONNECTION_BAD) if (PQstatus(pset.db) == CONNECTION_BAD)
{ {
pg_log_error("could not connect to server: %s", PQerrorMessage(pset.db)); pg_log_error("%s", PQerrorMessage(pset.db));
PQfinish(pset.db); PQfinish(pset.db);
exit(EXIT_BADCONN); exit(EXIT_BADCONN);
} }