mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bruce Momjian 2011-06-15 17:23:02 -04:00
parent 10db3de66e
commit e3df3572f6
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/pg_upgrade/option.c
View File

@ -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);
}
}
/*