refactor: apply more guidelines where API is as desired

Author: scop

completions/aspell

@@ -1,6 +1,6 @@
 # bash completion for aspell                               -*- shell-script -*-
 
-_aspell_dictionary()
+_comp_cmd_aspell__dictionary()
 {
     local datadir aspell=${1:-aspell}
     datadir=$("$aspell" config data-dir 2>/dev/null || echo /usr/lib/aspell)
@@ -49,7 +49,7 @@ _comp_cmd_aspell()
             return
             ;;
         -d | --master)
-            _aspell_dictionary "$1"
+            _comp_cmd_aspell__dictionary "$1"
             return
             ;;
         --add-filter | --rem-filter)

completions/kldload

@@ -2,7 +2,7 @@
 
 [[ $OSTYPE == *freebsd* ]] || return 1
 
-_kldload()
+_comp_cmd_kldload()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -28,6 +28,6 @@ _kldload()
     _filedir -d
 
 } &&
-    complete -F _kldload kldload
+    complete -F _comp_cmd_kldload kldload
 
 # ex: filetype=sh

completions/snownews

@@ -1,6 +1,6 @@
 # snownews(1) completion                                   -*- shell-script -*-
 
-_snownews()
+_comp_cmd_snownews()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -10,6 +10,6 @@ _snownews()
         COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-    complete -F _snownews snownews
+    complete -F _comp_cmd_snownews snownews
 
 # ex: filetype=sh

completions/sqlite3

@@ -1,6 +1,6 @@
 # sqlite3(1) completion                                    -*- shell-script -*-
 
-_sqlite3()
+_comp_cmd_sqlite3()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -33,6 +33,6 @@ _sqlite3()
 
     _filedir "$dbexts"
 } &&
-    complete -F _sqlite3 sqlite3
+    complete -F _comp_cmd_sqlite3 sqlite3
 
 # ex: filetype=sh

completions/ss

@@ -1,6 +1,6 @@
 # ss(8) completion                                         -*- shell-script -*-
 
-_ss()
+_comp_cmd_ss()
 {
     local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
@@ -38,6 +38,6 @@ _ss()
             close-wait last-ack listening closing' -- "$cur"))
     fi
 } &&
-    complete -F _ss ss
+    complete -F _comp_cmd_ss ss
 
 # ex: filetype=sh

completions/ssh

@@ -1,6 +1,6 @@
 # ssh(1) completion                                        -*- shell-script -*-
 
-_ssh_queries()
+_comp_cmd_ssh__queries()
 {
     local queries=$(_comp_xfunc_ssh_query "$1" help)
     [[ $queries ]] || queries="cipher cipher-auth mac kex key key-cert
@@ -17,7 +17,7 @@ _comp_xfunc_ssh_query()
 
 _comp_deprecate_func _ssh_query _comp_xfunc_ssh_query
 
-_ssh_ciphers()
+_comp_cmd_ssh__ciphers()
 {
     local ciphers=$(_comp_xfunc_ssh_query "$1" cipher)
     [[ $ciphers ]] || ciphers="3des-cbc aes128-cbc aes192-cbc aes256-cbc
@@ -26,7 +26,7 @@ _ssh_ciphers()
     COMPREPLY+=($(compgen -W "$ciphers" -- "$cur"))
 }
 
-_ssh_macs()
+_comp_cmd_ssh__macs()
 {
     local macs=$(_comp_xfunc_ssh_query "$1" mac)
     [[ $macs ]] || macs="hmac-md5 hmac-sha1 umac-64@openssh.com hmac-ripemd160
@@ -90,7 +90,7 @@ _comp_deprecate_func _ssh_options _comp_xfunc_ssh_options
 # the ssh executable to invoke (optional).
 # Not all suboptions are completed.
 # Doesn't handle comma-separated lists.
-_ssh_suboption()
+_comp_cmd_ssh__suboption()
 {
     # Split into subopt and subval
     local prev=${1%%=*} cur=${1#*=}
@@ -138,7 +138,7 @@ _ssh_suboption()
             COMPREPLY=($(compgen -W 'blowfish des 3des' -- "$cur"))
             ;;
         ciphers)
-            _ssh_ciphers "$2"
+            _comp_cmd_ssh__ciphers "$2"
             ;;
         controlmaster)
             COMPREPLY=($(compgen -W 'yes ask auto autoask no' -- "$cur"))
@@ -166,7 +166,7 @@ _ssh_suboption()
             ))
             ;;
         macs)
-            _ssh_macs "$2"
+            _comp_cmd_ssh__macs "$2"
             ;;
         pkcs11provider)
             _filedir so
@@ -220,7 +220,7 @@ _comp_xfunc_ssh_suboption_check()
     local cur prev
     _comp_get_words -n := cur prev
     if [[ $cur == *=* && $prev == -*o ]]; then
-        _ssh_suboption "$cur" "${1-}"
+        _comp_cmd_ssh__suboption "$cur" "${1-}"
         return $?
     fi
     return 1
@@ -261,7 +261,7 @@ _comp_xfunc_ssh_identityfile()
 
 _comp_deprecate_func _ssh_identityfile _comp_xfunc_ssh_identityfile
 
-_ssh()
+_comp_cmd_ssh()
 {
     local cur prev words cword comp_args
     _comp_initialize -n : -- "$@" || return
@@ -285,7 +285,7 @@ _ssh()
             return
             ;;
         -*c)
-            _ssh_ciphers "$1"
+            _comp_cmd_ssh__ciphers "$1"
             return
             ;;
         -*[DeLpRW])
@@ -312,7 +312,7 @@ _ssh()
             return
             ;;
         -*m)
-            _ssh_macs "$1"
+            _comp_cmd_ssh__macs "$1"
             return
             ;;
         -*O)
@@ -324,7 +324,7 @@ _ssh()
             return
             ;;
         -*Q)
-            _ssh_queries "$1"
+            _comp_cmd_ssh__queries "$1"
             return
             ;;
         -*w)
@@ -360,11 +360,12 @@ _ssh()
         fi
     fi
 } &&
-    shopt -u hostcomplete && complete -F _ssh ssh slogin autossh sidedoor
+    shopt -u hostcomplete &&
+    complete -F _comp_cmd_ssh ssh slogin autossh sidedoor
 
 # sftp(1) completion
 #
-_sftp()
+_comp_cmd_sftp()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -389,7 +390,7 @@ _sftp()
             return
             ;;
         -*c)
-            _ssh_ciphers
+            _comp_cmd_ssh__ciphers
             return
             ;;
         -*J)
@@ -425,7 +426,7 @@ _sftp()
         _known_hosts_real ${ipvx:+"$ipvx"} -a ${configfile:+-F "$configfile"} -- "$cur"
     fi
 } &&
-    shopt -u hostcomplete && complete -F _sftp sftp
+    shopt -u hostcomplete && complete -F _comp_cmd_sftp sftp
 
 # things we want to backslash escape in scp paths
 # shellcheck disable=SC2089
@@ -504,7 +505,7 @@ _comp_deprecate_func _scp_local_files _comp_xfunc_ssh_scp_local_files
 
 # scp(1) completion
 #
-_scp()
+_comp_cmd_scp()
 {
     local cur prev words cword comp_args
     _comp_initialize -n : -- "$@" || return
@@ -521,7 +522,7 @@ _scp()
 
     case $prev in
         -*c)
-            _ssh_ciphers
+            _comp_cmd_ssh__ciphers
             COMPREPLY=("${COMPREPLY[@]/%/ }")
             return
             ;;
@@ -593,6 +594,6 @@ _scp()
 
     _comp_xfunc_ssh_scp_local_files "${prefix-}"
 } &&
-    complete -F _scp -o nospace scp
+    complete -F _comp_cmd_scp -o nospace scp
 
 # ex: filetype=sh

completions/ssh-add

@@ -1,6 +1,6 @@
 # ssh-add(1) completion                                    -*- shell-script -*-
 
-_ssh_add()
+_comp_cmd_ssh_add()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -30,6 +30,6 @@ _ssh_add()
 
     _filedir
 } &&
-    complete -F _ssh_add ssh-add
+    complete -F _comp_cmd_ssh_add ssh-add
 
 # ex: filetype=sh

completions/ssh-copy-id

@@ -1,6 +1,6 @@
 # ssh-copy-id(1) completion                                -*- shell-script -*-
 
-_ssh_copy_id()
+_comp_cmd_ssh_copy_id()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -27,6 +27,6 @@ _ssh_copy_id()
         _known_hosts_real -a -- "$cur"
     fi
 } &&
-    complete -F _ssh_copy_id ssh-copy-id
+    complete -F _comp_cmd_ssh_copy_id ssh-copy-id
 
 # ex: filetype=sh

completions/ssh-keygen

@@ -1,6 +1,6 @@
 # ssh-keygen(1) completion                                 -*- shell-script -*-
 
-_ssh_keygen()
+_comp_cmd_ssh_keygen()
 {
     local cur prev words cword comp_args
     _comp_initialize -n := -- "$@" || return
@@ -126,6 +126,6 @@ _ssh_keygen()
         _filedir pub
     fi
 } &&
-    complete -F _ssh_keygen ssh-keygen
+    complete -F _comp_cmd_ssh_keygen ssh-keygen
 
 # ex: filetype=sh

completions/sshfs

@@ -1,6 +1,6 @@
 # sshfs(1) completion                                      -*- shell-script -*-
 
-_sshfs()
+_comp_cmd_sshfs()
 {
     local cur prev words cword comp_args
     _comp_initialize -n : -- "$@" || return
@@ -18,6 +18,6 @@ _sshfs()
 
     _comp_xfunc ssh scp_local_files -d
 } &&
-    complete -F _sshfs -o nospace sshfs
+    complete -F _comp_cmd_sshfs -o nospace sshfs
 
 # ex: filetype=sh