summaryrefslogtreecommitdiff
path: root/src/bin/pg_upgrade
diff options
context:
space:
mode:
authorTom Lane2018-04-26 18:47:16 +0000
committerTom Lane2018-04-26 18:47:16 +0000
commitbdf46af748d0f15f257c99bf06e9e25aba6a24f9 (patch)
tree3637d69ad413fdc23098cc2cf94b2cd57fd44dab /src/bin/pg_upgrade
parentf83bf385c1dad4964e0d899174989a1668536182 (diff)
Post-feature-freeze pgindent run.
Discussion: https://postgr.es/m/[email protected]
Diffstat (limited to 'src/bin/pg_upgrade')
-rw-r--r--src/bin/pg_upgrade/exec.c2
-rw-r--r--src/bin/pg_upgrade/server.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/bin/pg_upgrade/exec.c b/src/bin/pg_upgrade/exec.c
index 9122e2769e1..3d2de83a906 100644
--- a/src/bin/pg_upgrade/exec.c
+++ b/src/bin/pg_upgrade/exec.c
@@ -110,6 +110,7 @@ exec_prog(const char *log_file, const char *opt_log_file,
pg_log(PG_VERBOSE, "%s\n", cmd);
#ifdef WIN32
+
/*
* For some reason, Windows issues a file-in-use error if we write data to
* the log file from a non-primary thread just before we create a
@@ -191,6 +192,7 @@ exec_prog(const char *log_file, const char *opt_log_file,
}
#ifndef WIN32
+
/*
* We can't do this on Windows because it will keep the "pg_ctl start"
* output filename open until the server stops, so we do the \n\n above on
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
index 5273ef6681f..fccc21836a0 100644
--- a/src/bin/pg_upgrade/server.c
+++ b/src/bin/pg_upgrade/server.c
@@ -309,8 +309,8 @@ start_postmaster(ClusterInfo *cluster, bool report_and_exit_on_error)
/*
* If pg_ctl failed, and the connection didn't fail, and
- * report_and_exit_on_error is enabled, fail now. This
- * could happen if the server was already running.
+ * report_and_exit_on_error is enabled, fail now. This could happen if
+ * the server was already running.
*/
if (!pg_ctl_return)
{