pg_upgrade: simplify code layout in a few places

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

diff --git a/src/bin/pg_upgrade/exec.c b/src/bin/pg_upgrade/exec.c
index 6d04e5671db6c2511c83cb21f576f26feabc250d..13cdda281d26f7aeeb93d8c18e1080ffd91d5709 100644 (file)
--- a/src/bin/pg_upgrade/exec.c
+++ b/src/bin/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