Skip to content

Commit d8d1d82

Browse files
committed
refactor(tar): rename functions only used in initialization
1 parent b030e07 commit d8d1d82

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

completions/tar

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
_comp_deprecate_var 2.12 \
6060
COMP_TAR_INTERNAL_PATHS BASH_COMPLETION_CMD_TAR_INTERNAL_PATHS
6161

62-
_comp_cmd_gtar__parse_help_opt()
62+
_comp_cmd_gtar__init_parse_help_opt()
6363
{
6464
local opttype arg opt separator optvar
6565
opttype=long
@@ -98,7 +98,7 @@ _comp_cmd_gtar__parse_help_opt()
9898
eval "$optvar=\"\$$optvar$separator\"\"$opt\""
9999
}
100100

101-
_comp_cmd_gtar__parse_help_line()
101+
_comp_cmd_gtar__init_parse_help_line()
102102
{
103103
local i
104104
local -a tmp
@@ -107,7 +107,7 @@ _comp_cmd_gtar__parse_help_line()
107107
case "$i" in
108108
# regular options
109109
--* | -*)
110-
_comp_cmd_gtar__parse_help_opt "$i" "$2"
110+
_comp_cmd_gtar__init_parse_help_opt "$i" "$2"
111111
;;
112112

113113
# end once there is single non-option word
@@ -122,10 +122,10 @@ _comp_cmd_gtar__parse_help_line()
122122
# Parse the output of "tar --help" with GNU tar and store the parse results
123123
# in a global variable.
124124
#
125-
# @var[out] _comp_cmd_gtar__parse_help__result
125+
# @var[out] _comp_cmd_gtar__saved_opts
126126
# The parse results are stored in this global variable in a form that can
127127
# be evaluated by the builtin "eval".
128-
_comp_cmd_gtar__parse_help_initialize()
128+
_comp_cmd_gtar__init_parse_help()
129129
{
130130
local long_arg_none=""
131131
local long_arg_opt=""
@@ -154,15 +154,15 @@ _comp_cmd_gtar__parse_help_initialize()
154154
[[ ${BASH_REMATCH[1]} ]] && arg=opt || arg=req
155155
fi
156156

157-
_comp_cmd_gtar__parse_help_line "$str" "$arg"
157+
_comp_cmd_gtar__init_parse_help_line "$str" "$arg"
158158
fi
159159
done <<<"$(tar --help)"
160160

161161
local long_opts="$long_arg_none $long_arg_opt $long_arg_req"
162162

163163
local short_opts="$short_arg_none$short_arg_opt$short_arg_req"
164164

165-
printf -v _comp_cmd_gtar__parse_help__result '%s=%q ' \
165+
printf -v _comp_cmd_gtar__saved_opts '%s=%q ' \
166166
long_opts "$long_opts" \
167167
short_opts "$short_opts" \
168168
long_arg_none "$long_arg_none" \
@@ -173,11 +173,11 @@ _comp_cmd_gtar__parse_help_initialize()
173173
short_arg_req "$short_arg_req"
174174

175175
# Clean up functions only used in initialization
176-
unset -f "$FUNCNAME"
177-
unset -f _comp_cmd_gtar__parse_help_line
178-
unset -f _comp_cmd_gtar__parse_help_opt
176+
unset -f _comp_cmd_gtar__init_parse_help
177+
unset -f _comp_cmd_gtar__init_parse_help_line
178+
unset -f _comp_cmd_gtar__init_parse_help_opt
179179
}
180-
_comp_cmd_gtar__parse_help_initialize
180+
_comp_cmd_gtar__init_parse_help
181181

182182
# Load the parse results of "tar --help" for GNU tar into variables.
183183
#
@@ -191,12 +191,12 @@ _comp_cmd_gtar__parse_help_initialize
191191
# @var[out] short_arg_req
192192
# The parse results are returned in these variables.
193193
#
194-
# @var[in] _comp_cmd_gtar__parse_help__result
194+
# @var[in] _comp_cmd_gtar__saved_opts
195195
# The parse results are obtained by evaluating this variable with the
196196
# "eval" builtin.
197-
_comp_cmd_gtar__parse_help()
197+
_comp_cmd_gtar__load_opts()
198198
{
199-
eval -- "$_comp_cmd_gtar__parse_help__result"
199+
eval -- "$_comp_cmd_gtar__saved_opts"
200200
}
201201

202202
# Hack: parse --warning keywords from tar's error output
@@ -589,7 +589,7 @@ _comp_cmd_tar__gnu()
589589
local long_opts short_opts \
590590
long_arg_none long_arg_opt long_arg_req \
591591
short_arg_none short_arg_opt short_arg_req
592-
_comp_cmd_gtar__parse_help
592+
_comp_cmd_gtar__load_opts
593593

594594
local old_opt_progress old_opt_used old_opt_parsed
595595
_comp_cmd_tar__preparse_cmdline "${words[@]}"

0 commit comments

Comments
 (0)