1717
1818
1919static void usage (void );
20- static void validateDirectoryOption (char * * dirpath ,
20+ static void check_required_directory (char * * dirpath ,
2121char * envVarName ,char * cmdLineOption ,char * description );
2222
2323
@@ -203,13 +203,13 @@ parseCommandLine(int argc, char *argv[])
203203}
204204
205205/* Get values from env if not already set */
206- validateDirectoryOption (& old_cluster .bindir ,"OLDBINDIR" ,"-b" ,
206+ check_required_directory (& old_cluster .bindir ,"OLDBINDIR" ,"-b" ,
207207"old cluster binaries reside" );
208- validateDirectoryOption (& new_cluster .bindir ,"NEWBINDIR" ,"-B" ,
208+ check_required_directory (& new_cluster .bindir ,"NEWBINDIR" ,"-B" ,
209209"new cluster binaries reside" );
210- validateDirectoryOption (& old_cluster .pgdata ,"OLDDATADIR" ,"-d" ,
210+ check_required_directory (& old_cluster .pgdata ,"OLDDATADIR" ,"-d" ,
211211"old cluster data resides" );
212- validateDirectoryOption (& new_cluster .pgdata ,"NEWDATADIR" ,"-D" ,
212+ check_required_directory (& new_cluster .pgdata ,"NEWDATADIR" ,"-D" ,
213213"new cluster data resides" );
214214}
215215
@@ -272,9 +272,9 @@ or\n"), old_cluster.port, new_cluster.port, os_info.user);
272272
273273
274274/*
275- *validateDirectoryOption ()
275+ *check_required_directory ()
276276 *
277- *Validates a directory option.
277+ *Checks a directory option.
278278 *dirpath - the directory name supplied on the command line
279279 *envVarName - the name of an environment variable to get if dirpath is NULL
280280 *cmdLineOption - the command line option corresponds to this directory (-o, -O, -n, -N)
@@ -284,7 +284,7 @@ or\n"), old_cluster.port, new_cluster.port, os_info.user);
284284 * user hasn't provided the required directory name.
285285 */
286286static void
287- validateDirectoryOption (char * * dirpath ,char * envVarName ,
287+ check_required_directory (char * * dirpath ,char * envVarName ,
288288char * cmdLineOption ,char * description )
289289{
290290if (* dirpath == NULL || strlen (* dirpath )== 0 )