1 files changed, 23 insertions, 18 deletions

diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c
index aee8d3d153..1459ca9096 100644
--- a/contrib/pg_upgrade/option.c
+++ b/contrib/pg_upgrade/option.c
@@ -314,8 +314,8 @@ check_required_directory(char **dirpath, char **configpath,
 	}
 
 	/*
-	 * Trim off any trailing path separators because we construct paths
-	 * by appending to this path.
+	 * Trim off any trailing path separators because we construct paths by
+	 * appending to this path.
 	 */
 #ifndef WIN32
 	if ((*dirpath)[strlen(*dirpath) - 1] == '/')
@@ -398,10 +398,10 @@ void
 get_sock_dir(ClusterInfo *cluster, bool live_check)
 {
 #ifdef HAVE_UNIX_SOCKETS
+
 	/*
-	 *	sockdir and port were added to postmaster.pid in PG 9.1.
-	 *	Pre-9.1 cannot process pg_ctl -w for sockets in non-default
-	 *	locations.
+	 * sockdir and port were added to postmaster.pid in PG 9.1. Pre-9.1 cannot
+	 * process pg_ctl -w for sockets in non-default locations.
 	 */
 	if (GET_MAJOR_VERSION(cluster->major_version) >= 901)
 	{
@@ -415,26 +415,28 @@ get_sock_dir(ClusterInfo *cluster, bool live_check)
 		else
 		{
 			/*
-			 *	If we are doing a live check, we will use the old cluster's Unix
-			 *	domain socket directory so we can connect to the live server.
+			 * If we are doing a live check, we will use the old cluster's
+			 * Unix domain socket directory so we can connect to the live
+			 * server.
 			 */
 			unsigned short orig_port = cluster->port;
-			char		filename[MAXPGPATH], line[MAXPGPATH];
-			FILE		*fp;
+			char		filename[MAXPGPATH],
+						line[MAXPGPATH];
+			FILE	   *fp;
 			int			lineno;
-	
+
 			snprintf(filename, sizeof(filename), "%s/postmaster.pid",
 					 cluster->pgdata);
 			if ((fp = fopen(filename, "r")) == NULL)
 				pg_log(PG_FATAL, "Cannot open file %s: %m\n", filename);
-	
+
 			for (lineno = 1;
-				 lineno <= Max(LOCK_FILE_LINE_PORT, LOCK_FILE_LINE_SOCKET_DIR);
+			   lineno <= Max(LOCK_FILE_LINE_PORT, LOCK_FILE_LINE_SOCKET_DIR);
 				 lineno++)
 			{
 				if (fgets(line, sizeof(line), fp) == NULL)
 					pg_log(PG_FATAL, "Cannot read line %d from %s: %m\n", lineno, filename);
-	
+
 				/* potentially overwrite user-supplied value */
 				if (lineno == LOCK_FILE_LINE_PORT)
 					sscanf(line, "%hu", &old_cluster.port);
@@ -446,18 +448,21 @@ get_sock_dir(ClusterInfo *cluster, bool live_check)
 				}
 			}
 			fclose(fp);
-	
+
 			/* warn of port number correction */
 			if (orig_port != DEF_PGUPORT && old_cluster.port != orig_port)
 				pg_log(PG_WARNING, "User-supplied old port number %hu corrected to %hu\n",
-				orig_port, cluster->port);
+					   orig_port, cluster->port);
 		}
 	}
 	else
-		/* Can't get sockdir and pg_ctl -w can't use a non-default, use default */
-		cluster->sockdir = NULL;
 
-#else /* !HAVE_UNIX_SOCKETS */
+		/*
+		 * Can't get sockdir and pg_ctl -w can't use a non-default, use
+		 * default
+		 */
+		cluster->sockdir = NULL;
+#else							/* !HAVE_UNIX_SOCKETS */
 	cluster->sockdir = NULL;
 #endif
 }