Remove extra newlines after PQerrorMessage()

petere · petere · commit 280cf0fe789d · 2018-05-05T10:54:00.000-04:00
diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
@@ -219,7 +219,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);
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -1919,7 +1919,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
`@@ -219,7 +219,7 @@ GetConnection(void)`
`219`	`219`	`res = PQexec(tmpconn, ALWAYS_SECURE_SEARCH_PATH_SQL);`
`220`	`220`	`if (PQresultStatus(res) != PGRES_TUPLES_OK)`
`221`	`221`	`{`
`222`		`- fprintf(stderr, _("%s: could not clear search_path: %s\n"),`
	`222`	`+ fprintf(stderr, _("%s: could not clear search_path: %s"),`
`223`	`223`	`progname, PQerrorMessage(tmpconn));`
`224`	`224`	`PQclear(res);`
`225`	`225`	`PQfinish(tmpconn);`
Original file line number	Diff line number	Diff line change
`@@ -1919,7 +1919,7 @@ connectDatabase(const char dbname, const char connection_string,`
`1919`	`1919`	`if (fail_on_error)`
`1920`	`1920`	`{`
`1921`	`1921`	`fprintf(stderr,`
`1922`		`- _("%s: could not connect to database \"%s\": %s\n"),`
	`1922`	`+ _("%s: could not connect to database \"%s\": %s"),`
`1923`	`1923`	`progname, dbname, PQerrorMessage(conn));`
`1924`	`1924`	`exit_nicely(1);`
`1925`	`1925`	`}`