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

diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
index e9a2739f8e2a67b48e2da64c5a4080bb11c6edd6..9309a8de95536e260ffb9b862ca08e7cb32ed70a 100644 (file)
--- a/src/bin/pg_basebackup/streamutil.c
+++ b/src/bin/pg_basebackup/streamutil.c
@@ -201,8 +201,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 fea7a2213905c607734e9066c6b3a6f6a44182ad..361565d8612b8abeb4415d26259b458a4ac32895 100644 (file)
--- a/src/bin/pg_rewind/libpq_fetch.c
+++ b/src/bin/pg_rewind/libpq_fetch.c
@@ -50,8 +50,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");