Remove extra newlines after PQerrorMessage()

petere · petere · commit 2f52518773bb · 2018-05-05T10:51:38.000-04:00
diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
@@ -230,7 +230,7 @@ GetConnection(void)
 		res = PQexec(tmpconn, ALWAYS_SECURE_SEARCH_PATH_SQL);
 		if (PQresultStatus(res) != PGRES_TUPLES_OK)
 		{
-			fprintf(stderr, _("%s: could not clear search_path: %s\n"),
+			fprintf(stderr, _("%s: could not clear search_path: %s"),
 					progname, PQerrorMessage(tmpconn));
 			PQclear(res);
 			PQfinish(tmpconn);
@@ -300,7 +300,7 @@ RetrieveWalSegSize(PGconn *conn)
 	res = PQexec(conn, "SHOW wal_segment_size");
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		fprintf(stderr, _("%s: could not send replication command \"%s\": %s\n"),
+		fprintf(stderr, _("%s: could not send replication command \"%s\": %s"),
 				progname, "SHOW wal_segment_size", PQerrorMessage(conn));
 
 		PQclear(res);
@@ -372,7 +372,7 @@ RetrieveDataDirCreatePerm(PGconn *conn)
 	res = PQexec(conn, "SHOW data_directory_mode");
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		fprintf(stderr, _("%s: could not send replication command \"%s\": %s\n"),
+		fprintf(stderr, _("%s: could not send replication command \"%s\": %s"),
 				progname, "SHOW data_directory_mode", PQerrorMessage(conn));
 
 		PQclear(res);
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -1661,7 +1661,7 @@ connectDatabase(const char *dbname, const char *connection_string,
 		if (fail_on_error)
 		{
 			fprintf(stderr,
-					_("%s: could not connect to database \"%s\": %s\n"),
+					_("%s: could not connect to database \"%s\": %s"),
 					progname, dbname, PQerrorMessage(conn));
 			exit_nicely(1);
 		}

Original file line number	Diff line number	Diff line change
`@@ -1661,7 +1661,7 @@ connectDatabase(const char dbname, const char connection_string,`
`1661`	`1661`	`if (fail_on_error)`
`1662`	`1662`	`{`
`1663`	`1663`	`fprintf(stderr,`
`1664`		`- _("%s: could not connect to database \"%s\": %s\n"),`
	`1664`	`+ _("%s: could not connect to database \"%s\": %s"),`
`1665`	`1665`	`progname, dbname, PQerrorMessage(conn));`
`1666`	`1666`	`exit_nicely(1);`
`1667`	`1667`	`}`