diff options
Diffstat (limited to 'src/bin/pg_upgrade/server.c')
| -rw-r--r-- | src/bin/pg_upgrade/server.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c index 265137e86bf..79479edc0ee 100644 --- a/src/bin/pg_upgrade/server.c +++ b/src/bin/pg_upgrade/server.c @@ -130,7 +130,7 @@ executeQueryOrDie(PGconn *conn, const char *fmt,...) vsnprintf(query, sizeof(query), fmt, args); va_end(args); - pg_log(PG_VERBOSE, "executing: %s\n", query); + pg_log(PG_VERBOSE, "executing: %s", query); result = PQexec(conn, query); status = PQresultStatus(result); @@ -166,11 +166,11 @@ get_major_server_version(ClusterInfo *cluster) snprintf(ver_filename, sizeof(ver_filename), "%s/PG_VERSION", cluster->pgdata); if ((version_fd = fopen(ver_filename, "r")) == NULL) - pg_fatal("could not open version file \"%s\": %m\n", ver_filename); + pg_fatal("could not open version file \"%s\": %m", ver_filename); if (fscanf(version_fd, "%63s", cluster->major_version_str) == 0 || sscanf(cluster->major_version_str, "%d.%d", &v1, &v2) < 1) - pg_fatal("could not parse version file \"%s\"\n", ver_filename); + pg_fatal("could not parse version file \"%s\"", ver_filename); fclose(version_fd); @@ -293,11 +293,11 @@ start_postmaster(ClusterInfo *cluster, bool report_and_exit_on_error) PQfinish(conn); if (cluster == &old_cluster) pg_fatal("could not connect to source postmaster started with the command:\n" - "%s\n", + "%s", cmd); else pg_fatal("could not connect to target postmaster started with the command:\n" - "%s\n", + "%s", cmd); } PQfinish(conn); @@ -310,9 +310,9 @@ start_postmaster(ClusterInfo *cluster, bool report_and_exit_on_error) if (!pg_ctl_return) { if (cluster == &old_cluster) - pg_fatal("pg_ctl failed to start the source server, or connection failed\n"); + pg_fatal("pg_ctl failed to start the source server, or connection failed"); else - pg_fatal("pg_ctl failed to start the target server, or connection failed\n"); + pg_fatal("pg_ctl failed to start the target server, or connection failed"); } return true; @@ -357,7 +357,7 @@ check_pghost_envvar(void) start = PQconndefaults(); if (!start) - pg_fatal("out of memory\n"); + pg_fatal("out of memory"); for (option = start; option->keyword != NULL; option++) { @@ -370,7 +370,7 @@ check_pghost_envvar(void) /* check for 'local' host values */ (strcmp(value, "localhost") != 0 && strcmp(value, "127.0.0.1") != 0 && strcmp(value, "::1") != 0 && !is_unixsock_path(value))) - pg_fatal("libpq environment variable %s has a non-local server value: %s\n", + pg_fatal("libpq environment variable %s has a non-local server value: %s", option->envvar, value); } } |