Commite3df357

committed

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

1 parent10db3de commite3df357Copy full SHA for e3df357

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -288,21 +288,19 @@ or\n"), old_cluster.port, new_cluster.port, os_info.user);`
`288`	`288`	`* user hasn't provided the required directory name.`
`289`	`289`	`*/`
`290`	`290`	`staticvoid`
`291`		`-validateDirectoryOption(char**dirpath,`
`292`		`-charenvVarName,charcmdLineOption,char*description)`
	`291`	`+validateDirectoryOption(char*dirpath,charenvVarName,`
	`292`	`+charcmdLineOption,chardescription)`
`293`	`293`	`{`
`294`		`-if (dirpath==NULL\|\|(strlen(dirpath)==0))`
	`294`	`+if (dirpath==NULL\|\|strlen(dirpath)==0)`
`295`	`295`	`{`
`296`	`296`	`constchar*envVar;`
`297`	`297`
`298`	`298`	`if ((envVar=getenv(envVarName))&&strlen(envVar))`
`299`	`299`	`*dirpath=pg_strdup(envVar);`
`300`	`300`	`else`
`301`		`-{`
`302`	`301`	`pg_log(PG_FATAL,"You must identify the directory where the %s\n"`
`303`	`302`	`"Please use the %s command-line option or the %s environment variable\n",`
`304`	`303`	`description,cmdLineOption,envVarName);`
`305`		`-}`
`306`	`304`	`}`
`307`	`305`
`308`	`306`	`/*`

Comments

(0)