From 233bfe06735411f08d231764dfd3a6fcf7aef9a3 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 15 Jul 2013 20:04:14 -0400 Subject: [PATCH] Fix PQconninfoParse error message handling The returned error message already includes a newline, but the callers were adding their own when printing it out. --- src/bin/pg_basebackup/streamutil.c | 2 +- src/bin/pg_dump/pg_dumpall.c | 2 +- src/bin/scripts/pg_isready.c | 2 +- src/interfaces/libpq/test/uri-regress.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c index dab0e5470c..1dfb80f4a7 100644 --- 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 index 78f702f897..12533073d8 100644 --- 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 index 5cb75a42ec..d27ccea70f 100644 --- 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 index 6e1e3506fc..00acd64a5f 100644 --- 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; } -- 2.40.0