pg_upgrade: simplify code layout in a few places

Backpatch-through: 9.4 (9.3 didn't need improving)

diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c
index b38d801b5c17be51346c6baa45e7e628693afd78..3053c740329de2f5206eb6609005a0b833fb1fa8 100644 (file)
--- a/contrib/pg_upgrade/exec.c
+++ b/contrib/pg_upgrade/exec.c
@@ -73,7 +73,6 @@ 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
@@ -155,7 +154,6 @@ 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