In pg_upgrade, clean up code layout in validateDirectoryOption().

bmomjian · bmomjian · commit e3df3572f66a · 2011-06-15T17:23:02.000-04:00
diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c
@@ -288,21 +288,19 @@ or\n"), old_cluster.port, new_cluster.port, os_info.user);
  * user hasn't provided the required directory name.
  */
 static void
-validateDirectoryOption(char **dirpath,
-					char *envVarName, char *cmdLineOption, char *description)
+validateDirectoryOption(char **dirpath, char *envVarName,
+						char *cmdLineOption, char *description)
 {
-	if (*dirpath == NULL || (strlen(*dirpath) == 0))
+	if (*dirpath == NULL || strlen(*dirpath) == 0)
 	{
 		const char *envVar;
 
 		if ((envVar = getenv(envVarName)) && strlen(envVar))
 			*dirpath = pg_strdup(envVar);
 		else
-		{
 			pg_log(PG_FATAL, "You must identify the directory where the %s\n"
 				   "Please use the %s command-line option or the %s environment variable\n",
 				   description, cmdLineOption, envVarName);
-		}
 	}
 
 	/*
