@@ -122,7 +122,7 @@ static parray *datname_include_list = NULL;
122
122
/* arrays for --exclude-path's */
123
123
static parray * exclude_absolute_paths_list = NULL ;
124
124
static parray * exclude_relative_paths_list = NULL ;
125
- static char * waldir_path = NULL ;
125
+ static char * gl_waldir_path = NULL ;
126
126
127
127
/* checkdb options */
128
128
bool need_amcheck = false;
@@ -239,7 +239,7 @@ static ConfigOption cmd_options[] =
239
239
{'s' ,160 ,"primary-conninfo" ,& primary_conninfo ,SOURCE_CMD_STRICT },
240
240
{'s' ,'S' ,"primary-slot-name" ,& replication_slot ,SOURCE_CMD_STRICT },
241
241
{'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 },
243
243
/* checkdb options */
244
244
{'b' ,195 ,"amcheck" ,& need_amcheck ,SOURCE_CMD_STRICT },
245
245
{'b' ,196 ,"heapallindexed" ,& heapallindexed ,SOURCE_CMD_STRICT },
@@ -757,19 +757,19 @@ main(int argc, char *argv[])
757
757
restore_params -> partial_db_list = datname_include_list ;
758
758
}
759
759
760
- if (waldir_path )
760
+ if (gl_waldir_path )
761
761
{
762
762
/* 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 ))
765
765
{
766
766
elog (ERROR ,"WAL directory location must be an absolute path" );
767
767
}
768
- if (strlen (waldir_path )> MAXPGPATH )
768
+ if (strlen (gl_waldir_path )> MAXPGPATH )
769
769
elog (ERROR ,"Value specified to --waldir is too long" );
770
770
771
771
}
772
- restore_params -> waldir = waldir_path ;
772
+ restore_params -> waldir = gl_waldir_path ;
773
773
774
774
}
775
775