Fix redundant error messages in client tools

petere · petere · commit 6be725e70161 · 2020-11-07T23:03:54.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
@@ -200,8 +200,7 @@ GetConnection(void)
 
 	if (PQstatus(tmpconn) != CONNECTION_OK)
 	{
-		pg_log_error("could not connect to server: %s",
-					 PQerrorMessage(tmpconn));
+		pg_log_error("%s", PQerrorMessage(tmpconn));
 		PQfinish(tmpconn);
 		free(values);
 		free(keywords);
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
@@ -282,8 +282,7 @@ main(int argc, char **argv)
 		conn = PQconnectdb(connstr_source);
 
 		if (PQstatus(conn) == CONNECTION_BAD)
-			pg_fatal("could not connect to server: %s",
-					 PQerrorMessage(conn));
+			pg_fatal("%s", PQerrorMessage(conn));
 
 		if (showprogress)
 			pg_log_info("connected to server");
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -295,7 +295,7 @@ main(int argc, char *argv[])
 
 	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);
 		exit(EXIT_BADCONN);
 	}

Original file line number	Diff line number	Diff line change
`@@ -200,8 +200,7 @@ GetConnection(void)`
`200`	`200`
`201`	`201`	`if (PQstatus(tmpconn) != CONNECTION_OK)`
`202`	`202`	`{`
`203`		`- pg_log_error("could not connect to server: %s",`
`204`		`- PQerrorMessage(tmpconn));`
	`203`	`+ pg_log_error("%s", PQerrorMessage(tmpconn));`
`205`	`204`	`PQfinish(tmpconn);`
`206`	`205`	`free(values);`
`207`	`206`	`free(keywords);`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ main(int argc, char *argv[])`
`295`	`295`
`296`	`296`	`if (PQstatus(pset.db) == CONNECTION_BAD)`
`297`	`297`	`{`
`298`		`- pg_log_error("could not connect to server: %s", PQerrorMessage(pset.db));`
	`298`	`+ pg_log_error("%s", PQerrorMessage(pset.db));`
`299`	`299`	`PQfinish(pset.db);`
`300`	`300`	`exit(EXIT_BADCONN);`
`301`	`301`	`}`