Fix PQconninfoParse error message handling

petere · petere · commit 233bfe067354 · 2013-07-15T20:04:14.000-04:00
The returned error message already includes a newline, but the callers
were adding their own when printing it out.
diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
@@ -56,7 +56,7 @@ GetConnection(void)
 		conn_opts = PQconninfoParse(connection_string, &err_msg);
 		if (conn_opts == NULL)
 		{
-			fprintf(stderr, "%s: %s\n", progname, err_msg);
+			fprintf(stderr, "%s: %s", progname, err_msg);
 			exit(1);
 		}
 
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -1752,7 +1752,7 @@ connectDatabase(const char *dbname, const char *connection_string,
 			conn_opts = PQconninfoParse(connection_string, &err_msg);
 			if (conn_opts == NULL)
 			{
-				fprintf(stderr, "%s: %s\n", progname, err_msg);
+				fprintf(stderr, "%s: %s", progname, err_msg);
 				exit_nicely(1);
 			}
 
diff --git a/src/bin/scripts/pg_isready.c b/src/bin/scripts/pg_isready.c
@@ -135,7 +135,7 @@ main(int argc, char **argv)
 		opts = PQconninfoParse(pgdbname, &errmsg);
 		if (opts == NULL)
 		{
-			fprintf(stderr, _("%s: %s\n"), progname, errmsg);
+			fprintf(stderr, _("%s: %s"), progname, errmsg);
 			exit(PQPING_NO_ATTEMPT);
 		}
 	}
diff --git a/src/interfaces/libpq/test/uri-regress.c b/src/interfaces/libpq/test/uri-regress.c
@@ -33,7 +33,7 @@ main(int argc, char *argv[])
 	opts = PQconninfoParse(argv[1], &errmsg);
 	if (opts == NULL)
 	{
-		fprintf(stderr, "uri-regress: %s\n", errmsg);
+		fprintf(stderr, "uri-regress: %s", errmsg);
 		return 1;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ GetConnection(void)`
`56`	`56`	`conn_opts = PQconninfoParse(connection_string, &err_msg);`
`57`	`57`	`if (conn_opts == NULL)`
`58`	`58`	`{`
`59`		`- fprintf(stderr, "%s: %s\n", progname, err_msg);`
	`59`	`+ fprintf(stderr, "%s: %s", progname, err_msg);`
`60`	`60`	`exit(1);`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -1752,7 +1752,7 @@ connectDatabase(const char dbname, const char connection_string,`
`1752`	`1752`	`conn_opts = PQconninfoParse(connection_string, &err_msg);`
`1753`	`1753`	`if (conn_opts == NULL)`
`1754`	`1754`	`{`
`1755`		`- fprintf(stderr, "%s: %s\n", progname, err_msg);`
	`1755`	`+ fprintf(stderr, "%s: %s", progname, err_msg);`
`1756`	`1756`	`exit_nicely(1);`
`1757`	`1757`	`}`
`1758`	`1758`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ main(int argc, char **argv)`
`135`	`135`	`opts = PQconninfoParse(pgdbname, &errmsg);`
`136`	`136`	`if (opts == NULL)`
`137`	`137`	`{`
`138`		`- fprintf(stderr, _("%s: %s\n"), progname, errmsg);`
	`138`	`+ fprintf(stderr, _("%s: %s"), progname, errmsg);`
`139`	`139`	`exit(PQPING_NO_ATTEMPT);`
`140`	`140`	`}`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ main(int argc, char *argv[])`
`33`	`33`	`opts = PQconninfoParse(argv[1], &errmsg);`
`34`	`34`	`if (opts == NULL)`
`35`	`35`	`{`
`36`		`- fprintf(stderr, "uri-regress: %s\n", errmsg);`
	`36`	`+ fprintf(stderr, "uri-regress: %s", errmsg);`
`37`	`37`	`return 1;`
`38`	`38`	`}`
`39`	`39`