Fix PQconninfoParse error message handling

The returned error message already includes a newline, but the callers
were adding their own when printing it out.
pull/6/head
Peter Eisentraut 12 years ago
parent 4ed22e891f
commit 233bfe0673
  1. 2
      src/bin/pg_basebackup/streamutil.c
  2. 2
      src/bin/pg_dump/pg_dumpall.c
  3. 2
      src/bin/scripts/pg_isready.c
  4. 2
      src/interfaces/libpq/test/uri-regress.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);
}

@ -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);
}

@ -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);
}
}

@ -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;
}

Loading…
Cancel
Save