From 468bed27ce8dadb5f445ce1587b441b563dfb3d4 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 7 Nov 2020 22:15:52 +0100 Subject: [PATCH] Fix redundant error messages in client tools 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 --- src/bin/pg_basebackup/streamutil.c | 3 +-- src/bin/pg_rewind/libpq_fetch.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c index a240aae9f2f..882ba4b50a5 100644 --- a/src/bin/pg_basebackup/streamutil.c +++ b/src/bin/pg_basebackup/streamutil.c @@ -190,8 +190,7 @@ GetConnection(void) if (PQstatus(tmpconn) != CONNECTION_OK) { - fprintf(stderr, _("%s: could not connect to server: %s"), - progname, PQerrorMessage(tmpconn)); + fprintf(stderr, _("%s: %s"), progname, PQerrorMessage(tmpconn)); PQfinish(tmpconn); free(values); free(keywords); diff --git a/src/bin/pg_rewind/libpq_fetch.c b/src/bin/pg_rewind/libpq_fetch.c index 2c0c5723f79..583752ab200 100644 --- a/src/bin/pg_rewind/libpq_fetch.c +++ b/src/bin/pg_rewind/libpq_fetch.c @@ -54,8 +54,7 @@ libpqConnect(const char *connstr) conn = PQconnectdb(connstr); if (PQstatus(conn) == CONNECTION_BAD) - pg_fatal("could not connect to server: %s", - PQerrorMessage(conn)); + pg_fatal("%s", PQerrorMessage(conn)); pg_log(PG_PROGRESS, "connected to server\n");