Skip to content

Commit e3f2c69

Browse files
scopscop
committed
refactor([t-z]*): apply naming guidelines where API is as desired
1 parent 7bc7bc0 commit e3f2c69

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+178
-176
lines changed

‎completions/tar

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ __tar_is_argreq()
268268
}
269269

270270
# Called only for short parameter
271-
__tar_complete_mode()
271+
_comp_cmd_tar__mode()
272272
{
273273
local short_modes rawopt generated \
274274
allshort_raw_unused allshort_raw \
@@ -327,7 +327,7 @@ __tar_complete_mode()
327327
return 0
328328
}
329329

330-
__gtar_complete_lopts()
330+
_comp_cmd_tar__gnu_long_options()
331331
{
332332
local rv
333333
COMPREPLY=($(compgen -W "$long_opts" -- "$cur"))
@@ -336,7 +336,7 @@ __gtar_complete_lopts()
336336
return $rv
337337
}
338338

339-
__gtar_complete_sopts()
339+
_comp_cmd_tar__gnu_short_options()
340340
{
341341
local generated short_mode_opts i c
342342
short_mode_opts="ctxurdA"
@@ -357,20 +357,20 @@ __tar_try_mode()
357357
--*)
358358
# posix tar does not support long opts
359359
[[ $basic_tar ]] && return 0
360-
__gtar_complete_lopts
360+
_comp_cmd_tar__gnu_long_options
361361
return $?
362362
;;
363363

364364
-*)
365365
# posix tar does not support short options
366366
[[ $basic_tar ]] && return 0
367367

368-
__tar_complete_mode && return 0
368+
_comp_cmd_tar__mode && return 0
369369
;;
370370

371371
*)
372372
if [[ $cword -eq 1 || $tar_mode == none ]]; then
373-
__tar_complete_mode && return 0
373+
_comp_cmd_tar__mode && return 0
374374
fi
375375
;;
376376
esac
@@ -397,7 +397,7 @@ __tar_extract_like_mode()
397397
return 1
398398
}
399399

400-
__tar_try_list_archive()
400+
_comp_cmd_tar__try_list_archive()
401401
{
402402
local tarball="" tarbin untar i
403403

@@ -482,7 +482,7 @@ __tar_detect_ext()
482482
esac
483483
}
484484

485-
_gtar()
485+
_comp_cmd_tar__gnu()
486486
{
487487
local long_opts short_opts basic_tar="" \
488488
long_arg_none="" long_arg_opt="" long_arg_req="" \
@@ -628,12 +628,12 @@ _gtar()
628628
# handle others
629629
case "$cur" in
630630
--*)
631-
__gtar_complete_lopts
631+
_comp_cmd_tar__gnu_long_options
632632
break
633633
;;
634634
-*)
635635
# called only if it is *not* first parameter
636-
__gtar_complete_sopts
636+
_comp_cmd_tar__gnu_short_options
637637
break
638638
;;
639639
esac
@@ -642,7 +642,7 @@ _gtar()
642642
# was truth - the 'break' statement would have been already called
643643
((cword == 1)) && break
644644

645-
__tar_try_list_archive && break
645+
_comp_cmd_tar__try_list_archive && break
646646

647647
# file completion on relevant files
648648
if [[ $tar_mode != none ]]; then
@@ -672,7 +672,7 @@ __tar_posix_prev_handle()
672672
return 1
673673
}
674674

675-
_posix_tar()
675+
_comp_cmd_tar__posix()
676676
{
677677
local long_opts short_opts basic_tar=set \
678678
long_arg_none="" long_arg_opt long_arg_req="" \
@@ -710,22 +710,22 @@ _posix_tar()
710710

711711
__tar_try_mode && return
712712

713-
__tar_try_list_archive && return
713+
_comp_cmd_tar__try_list_archive && return
714714

715715
# file completion on relevant files
716716
_filedir
717717
}
718718

719-
_tar()
719+
_comp_cmd_tar()
720720
{
721721
local cmd=${COMP_WORDS[0]} func line
722722
line="$("$cmd" --version 2>/dev/null)"
723723
case "$line" in
724724
*GNU*)
725-
func=_gtar
725+
func=_comp_cmd_tar__gnu
726726
;;
727727
*)
728-
func=_posix_tar
728+
func=_comp_cmd_tar__posix
729729
;;
730730
esac
731731
$func "$@"
@@ -736,19 +736,19 @@ _tar()
736736
else
737737
complete -F $func tar
738738
fi
739-
unset -f _tar
739+
unset -f "$FUNCNAME"
740740
}
741741

742742
if [[ ${BASH_COMPLETION_CMD_TAR_INTERNAL_PATHS-${COMP_TAR_INTERNAL_PATHS-}} ]]; then
743-
complete -F _tar -o dirnames tar
744-
complete -F _gtar -o dirnames gtar
745-
complete -F _posix_tar -o dirnames bsdtar
746-
complete -F _posix_tar -o dirnames star
743+
complete -F _comp_cmd_tar -o dirnames tar
744+
complete -F _comp_cmd_tar__gnu -o dirnames gtar
745+
complete -F _comp_cmd_tar__posix -o dirnames bsdtar
746+
complete -F _comp_cmd_tar__posix -o dirnames star
747747
else
748-
complete -F _tar tar
749-
complete -F _gtar gtar
750-
complete -F _posix_tar bsdtar
751-
complete -F _posix_tar star
748+
complete -F _comp_cmd_tar tar
749+
complete -F _comp_cmd_tar__gnu gtar
750+
complete -F _comp_cmd_tar__posix bsdtar
751+
complete -F _comp_cmd_tar__posix star
752752
fi
753753

754754
# ex: filetype=sh

‎completions/tcpdump

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# bash completion for tcpdump -*- shell-script -*-
22

3-
_tcpdump()
3+
_comp_cmd_tcpdump()
44
{
55
local cur prev words cword was_split comp_args
66
_comp_initialize -s -- "$@" || return
@@ -61,6 +61,6 @@ _tcpdump()
6161
fi
6262

6363
} &&
64-
complete -F _tcpdump tcpdump
64+
complete -F _comp_cmd_tcpdump tcpdump
6565

6666
# ex: filetype=sh

‎completions/tcpkill

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tcpkill completion -*- shell-script -*-
22

3-
_tcpkill()
3+
_comp_cmd_tcpkill()
44
{
55
local cur prev words cword comp_args
66
_comp_initialize -- "$@" || return
@@ -17,6 +17,6 @@ _tcpkill()
1717
fi
1818

1919
} &&
20-
complete -F _tcpkill tcpkill
20+
complete -F _comp_cmd_tcpkill tcpkill
2121

2222
# ex: filetype=sh

‎completions/tcpnice

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tcpnice completion -*- shell-script -*-
22

3-
_tcpnice()
3+
_comp_cmd_tcpnice()
44
{
55
local cur prev words cword comp_args
66
_comp_initialize -- "$@" || return
@@ -17,6 +17,6 @@ _tcpnice()
1717
fi
1818

1919
} &&
20-
complete -F _tcpnice tcpnice
20+
complete -F _comp_cmd_tcpnice tcpnice
2121

2222
# ex: filetype=sh

‎completions/timeout

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# timeout(1) completion -*- shell-script -*-
22

3-
_timeout()
3+
_comp_cmd_timeout()
44
{
55
local cur prev words cword was_split comp_args i found=""
66
_comp_initialize -s -- "$@" || return
@@ -38,6 +38,6 @@ _timeout()
3838
[[ ${COMPREPLY-} == *= ]] && compopt -o nospace
3939
fi
4040
} &&
41-
complete -F _timeout timeout
41+
complete -F _comp_cmd_timeout timeout
4242

4343
# ex: filetype=sh

‎completions/tipc

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tipc(8) completion -*- shell-script -*-
22

3-
_tipc_media()
3+
_comp_cmd_tipc__media()
44
{
55
local optind=$1
66

@@ -15,12 +15,12 @@ _tipc_media()
1515
return 1
1616
}
1717

18-
_tipc_bearer()
18+
_comp_cmd_tipc__bearer()
1919
{
2020
local optind=$1
2121
local media i
2222

23-
if _tipc_media "$optind"; then
23+
if _comp_cmd_tipc__media "$optind"; then
2424
return
2525
fi
2626

@@ -55,12 +55,12 @@ _tipc_bearer()
5555
fi
5656
}
5757

58-
_tipc_link_opts()
58+
_comp_cmd_tipc__link_opts()
5959
{
6060
COMPREPLY=($(compgen -W 'priority tolerance window' -- "$cur"))
6161
}
6262

63-
_tipc_link()
63+
_comp_cmd_tipc__link()
6464
{
6565
local optind=$1
6666
local filter=$2
@@ -77,7 +77,7 @@ _tipc_link()
7777
fi
7878
}
7979

80-
_tipc()
80+
_comp_cmd_tipc()
8181
{
8282
local cur prev words cword comp_args optind i p
8383
_comp_initialize -- "$@" || return
@@ -117,7 +117,7 @@ _tipc()
117117
((optind++))
118118

119119
if ((cword < optind + 4)); then
120-
_tipc_bearer $optind
120+
_comp_cmd_tipc__bearer $optind
121121
return
122122
fi
123123

@@ -162,24 +162,24 @@ _tipc()
162162
disable)
163163
((optind++))
164164

165-
_tipc_bearer $optind
165+
_comp_cmd_tipc__bearer $optind
166166
;;
167167
get)
168168
((optind++))
169169

170170
if ((cword == optind)); then
171-
_tipc_link_opts
171+
_comp_cmd_tipc__link_opts
172172
elif ((cword >= optind + 1)); then
173-
_tipc_bearer $((optind + 1))
173+
_comp_cmd_tipc__bearer $((optind + 1))
174174
fi
175175
;;
176176
set)
177177
((optind++))
178178

179179
if ((cword == optind)); then
180-
_tipc_link_opts
180+
_comp_cmd_tipc__link_opts
181181
elif ((cword >= optind + 2)); then
182-
_tipc_bearer $((optind + 2))
182+
_comp_cmd_tipc__bearer $((optind + 2))
183183
fi
184184
;;
185185
esac
@@ -197,18 +197,18 @@ _tipc()
197197
((optind++))
198198

199199
if ((cword == optind)); then
200-
_tipc_link_opts
200+
_comp_cmd_tipc__link_opts
201201
elif ((cword >= optind + 1)); then
202-
_tipc_link $((optind + 1)) "peers"
202+
_comp_cmd_tipc__link $((optind + 1)) "peers"
203203
fi
204204
;;
205205
set)
206206
((optind++))
207207

208208
if ((cword == optind)); then
209-
_tipc_link_opts
209+
_comp_cmd_tipc__link_opts
210210
elif ((cword >= optind + 2)); then
211-
_tipc_link $((optind + 2)) "peers"
211+
_comp_cmd_tipc__link $((optind + 2)) "peers"
212212
fi
213213
;;
214214
statistics)
@@ -221,7 +221,7 @@ _tipc()
221221

222222
case "${words[optind]}" in
223223
show | reset)
224-
_tipc_link $((optind + 1))
224+
_comp_cmd_tipc__link $((optind + 1))
225225
;;
226226
esac
227227
;;
@@ -240,18 +240,18 @@ _tipc()
240240
((optind++))
241241

242242
if ((cword == optind)); then
243-
_tipc_link_opts
243+
_comp_cmd_tipc__link_opts
244244
elif ((cword >= optind + 1)); then
245-
_tipc_media $((optind + 1))
245+
_comp_cmd_tipc__media $((optind + 1))
246246
fi
247247
;;
248248
set)
249249
((optind++))
250250

251251
if ((cword == optind)); then
252-
_tipc_link_opts
252+
_comp_cmd_tipc__link_opts
253253
elif ((cword >= optind + 2)); then
254-
_tipc_media $((optind + 2))
254+
_comp_cmd_tipc__media $((optind + 2))
255255
fi
256256
;;
257257
esac
@@ -290,6 +290,6 @@ _tipc()
290290
;;
291291
esac
292292
} &&
293-
complete -F _tipc tipc
293+
complete -F _comp_cmd_tipc tipc
294294

295295
# ex: filetype=sh

‎completions/tox

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tox completion -*- shell-script -*-
22

3-
_tox()
3+
_comp_cmd_tox()
44
{
55
local cur prev words cword comp_args
66
_comp_initialize -- "$@" || return
@@ -46,6 +46,6 @@ _tox()
4646
return
4747
fi
4848
} &&
49-
complete -F _tox tox
49+
complete -F _comp_cmd_tox tox
5050

5151
# ex: filetype=sh

0 commit comments

Comments
 (0)