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

Rename pg_upgrade directory validation function, for clarity.

Browse Source
This commit is contained in:
Bruce Momjian 2011-06-22 17:50:40 -04:00
parent 559b114dd4
commit effbe6ecb4
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/pg_upgrade/check.c
View File

@ -393,8 +393,7 @@ check_old_cluster_has_new_cluster_dbs(void)
* This is particularly useful for tablespace deletion. * This is particularly useful for tablespace deletion.
*/ */
void void
create_script_for_old_cluster_deletion( create_script_for_old_cluster_deletion(char **deletion_script_file_name)
char **deletion_script_file_name)
{ {
FILE *script = NULL; FILE *script = NULL;
int tblnum; int tblnum;

16
contrib/pg_upgrade/option.c
View File

@ -17,7 +17,7 @@
static void usage(void); static void usage(void);
static void validateDirectoryOption(char **dirpath, static void check_required_directory(char **dirpath,
char *envVarName, char *cmdLineOption, char *description); char *envVarName, char *cmdLineOption, char *description);
@ -203,13 +203,13 @@ parseCommandLine(int argc, char *argv[])
} }
/* Get values from env if not already set */ /* Get values from env if not already set */
validateDirectoryOption(&old_cluster.bindir, "OLDBINDIR", "-b", check_required_directory(&old_cluster.bindir, "OLDBINDIR", "-b",
"old cluster binaries reside"); "old cluster binaries reside");
validateDirectoryOption(&new_cluster.bindir, "NEWBINDIR", "-B", check_required_directory(&new_cluster.bindir, "NEWBINDIR", "-B",
"new cluster binaries reside"); "new cluster binaries reside");
validateDirectoryOption(&old_cluster.pgdata, "OLDDATADIR", "-d", check_required_directory(&old_cluster.pgdata, "OLDDATADIR", "-d",
"old cluster data resides"); "old cluster data resides");
validateDirectoryOption(&new_cluster.pgdata, "NEWDATADIR", "-D", check_required_directory(&new_cluster.pgdata, "NEWDATADIR", "-D",
"new cluster data resides"); "new cluster data resides");
} }
@ -272,9 +272,9 @@ or\n"), old_cluster.port, new_cluster.port, os_info.user);
/* /*
* validateDirectoryOption() * check_required_directory()
* *
* Validates a directory option. * Checks a directory option.
* dirpath - the directory name supplied on the command line * dirpath - the directory name supplied on the command line
* envVarName - the name of an environment variable to get if dirpath is NULL * envVarName - the name of an environment variable to get if dirpath is NULL
* cmdLineOption - the command line option corresponds to this directory (-o, -O, -n, -N) * 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);
* user hasn't provided the required directory name. * user hasn't provided the required directory name.
*/ */
static void static void
validateDirectoryOption(char **dirpath, char *envVarName, check_required_directory(char **dirpath, char *envVarName,
char *cmdLineOption, char *description) char *cmdLineOption, char *description)
{ {
if (*dirpath == NULL || strlen(*dirpath) == 0) if (*dirpath == NULL || strlen(*dirpath) == 0)