Pgindent run on pg_upgrade source after restructuring.

contrib/pg_upgrade/controldata.c

@@ -549,9 +549,10 @@ putenv2(const char *var, const char *val)
 
 		sprintf(envstr, "%s=%s", var, val);
 		putenv(envstr);
+
 		/*
-		 *	Do not free envstr because it becomes part of the environment
-		 *	on some operating systems.  See port/unsetenv.c::unsetenv.
+		 * Do not free envstr because it becomes part of the environment on
+		 * some operating systems.	See port/unsetenv.c::unsetenv.
 		 */
 #else
 		SetEnvironmentVariableA(var, val);

contrib/pg_upgrade/pg_upgrade.c

@@ -22,7 +22,8 @@ static void set_frozenxids(void);
 static void setup(char *argv0, bool live_check);
 static void cleanup(void);
 
-ClusterInfo old_cluster, new_cluster;
+ClusterInfo old_cluster,
+			new_cluster;
 OSInfo		os_info;
 
 int

contrib/pg_upgrade/pg_upgrade.h

@@ -242,7 +242,8 @@ typedef struct
  */
 extern Log	log;
 extern UserOpts user_opts;
-extern ClusterInfo 	old_cluster, new_cluster;
+extern ClusterInfo old_cluster,
+			new_cluster;
 extern OSInfo os_info;
 extern char scandir_file_pattern[];
 

contrib/pg_upgrade/server.c

@@ -175,8 +175,8 @@ start_postmaster(Cluster whichCluster, bool quiet)
 	/*
 	 * On Win32, we can't send both pg_upgrade output and pg_ctl output to the
 	 * same file because we get the error: "The process cannot access the file
-	 * because it is being used by another process." so we have to send all other
-	 * output to 'nul'.
+	 * because it is being used by another process." so we have to send all
+	 * other output to 'nul'.
 	 */
 	snprintf(cmd, sizeof(cmd),
 			 SYSTEMQUOTE "\"%s/pg_ctl\" -l \"%s\" -D \"%s\" "