Remove extra newlines after PQerrorMessage()

petere · petere · commit 0ebb3a4e16d2 · 2018-05-05T10:53:01.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
@@ -2017,7 +2017,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
`@@ -2017,7 +2017,7 @@ connectDatabase(const char dbname, const char connection_string,`
`2017`	`2017`	`if (fail_on_error)`
`2018`	`2018`	`{`
`2019`	`2019`	`fprintf(stderr,`
`2020`		`- _("%s: could not connect to database \"%s\": %s\n"),`
	`2020`	`+ _("%s: could not connect to database \"%s\": %s"),`
`2021`	`2021`	`progname, dbname, PQerrorMessage(conn));`
`2022`	`2022`	`exit_nicely(1);`
`2023`	`2023`	`}`