Fix redundant error messages in client tools

petere · petere · commit 8096be26178b · 2020-11-07T22:45:07.000+01:00
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
@@ -193,8 +193,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
@@ -55,8 +55,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");
 

Original file line number	Diff line number	Diff line change
`@@ -193,8 +193,7 @@ GetConnection(void)`
`193`	`193`
`194`	`194`	`if (PQstatus(tmpconn) != CONNECTION_OK)`
`195`	`195`	`{`
`196`		`- fprintf(stderr, _("%s: could not connect to server: %s"),`
`197`		`- progname, PQerrorMessage(tmpconn));`
	`196`	`+ fprintf(stderr, _("%s: %s"), progname, PQerrorMessage(tmpconn));`
`198`	`197`	`PQfinish(tmpconn);`
`199`	`198`	`free(values);`
`200`	`199`	`free(keywords);`