From e3df3572f66aa099d337f013dceef7d519ef8398 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 15 Jun 2011 17:23:02 -0400
Subject: [PATCH] In pg_upgrade, clean up code layout in
validateDirectoryOption().
---
contrib/pg_upgrade/option.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c
index abb74a5bfa4..8153e3087a8 100644
--- 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);
- }
}
/*
--
GitLab