Skip to content

Commit 61cd620

Browse files
committed
[PBCKP-153] global variable waldir_path renamed to gl_waldir_path
1 parent e11ca78 commit 61cd620

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/pg_probackup.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static parray *datname_include_list = NULL;
122122
/* arrays for --exclude-path's */
123123
static parray *exclude_absolute_paths_list = NULL;
124124
static parray *exclude_relative_paths_list = NULL;
125-
static char* waldir_path = NULL;
125+
static char* gl_waldir_path = NULL;
126126

127127
/* checkdb options */
128128
bool need_amcheck = false;
@@ -239,7 +239,7 @@ static ConfigOption cmd_options[] =
239239
{ 's', 160, "primary-conninfo", &primary_conninfo, SOURCE_CMD_STRICT },
240240
{ 's', 'S', "primary-slot-name",&replication_slot, SOURCE_CMD_STRICT },
241241
{ 'f', 'I', "incremental-mode", opt_incr_restore_mode, SOURCE_CMD_STRICT },
242-
{ 's', 'X', "waldir", &waldir_path, SOURCE_CMD_STRICT },
242+
{ 's', 'X', "waldir", &gl_waldir_path, SOURCE_CMD_STRICT },
243243
/* checkdb options */
244244
{ 'b', 195, "amcheck", &need_amcheck, SOURCE_CMD_STRICT },
245245
{ 'b', 196, "heapallindexed", &heapallindexed, SOURCE_CMD_STRICT },
@@ -757,19 +757,19 @@ main(int argc, char *argv[])
757757
restore_params->partial_db_list = datname_include_list;
758758
}
759759

760-
if (waldir_path)
760+
if (gl_waldir_path)
761761
{
762762
/* clean up xlog directory name, check it's absolute */
763-
canonicalize_path(waldir_path);
764-
if (!is_absolute_path(waldir_path))
763+
canonicalize_path(gl_waldir_path);
764+
if (!is_absolute_path(gl_waldir_path))
765765
{
766766
elog(ERROR, "WAL directory location must be an absolute path");
767767
}
768-
if (strlen(waldir_path) > MAXPGPATH)
768+
if (strlen(gl_waldir_path) > MAXPGPATH)
769769
elog(ERROR, "Value specified to --waldir is too long");
770770

771771
}
772-
restore_params->waldir = waldir_path;
772+
restore_params->waldir = gl_waldir_path;
773773

774774
}
775775

0 commit comments

Comments
 (0)