refactor([m-o]*): apply naming guidelines where API is as desired

Co-authored-by: Koichi Murase <[email protected]>

Author: scop

completions/macof

@@ -1,6 +1,6 @@
 # macof completion                                         -*- shell-script -*-
 
-_macof()
+_comp_cmd_macof()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -17,6 +17,6 @@ _macof()
     fi
 
 } &&
-    complete -F _macof macof
+    complete -F _comp_cmd_macof macof
 
 # ex: filetype=sh

completions/mailmanctl

@@ -1,6 +1,6 @@
 # mailmanctl completion                                    -*- shell-script -*-
 
-_mailmanctl()
+_comp_cmd_mailmanctl()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -13,6 +13,6 @@ _mailmanctl()
     fi
 
 } &&
-    complete -F _mailmanctl mailmanctl
+    complete -F _comp_cmd_mailmanctl mailmanctl
 
 # ex: filetype=sh

completions/make

@@ -98,7 +98,7 @@ EOF
 # @var[in] cur
 # @var[in] mode
 # @var[in,out] COMPREPLY
-_comp_make__truncate_non_unique_paths()
+_comp_cmd_make__truncate_non_unique_paths()
 {
     local prefix=$cur
     [[ $mode == -d ]] && prefix=
@@ -137,7 +137,7 @@ _comp_make__truncate_non_unique_paths()
     fi
 }
 
-_make()
+_comp_cmd_make()
 {
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
@@ -229,7 +229,7 @@ _make()
             ${makef+"${makef[@]}"} "${makef_dir[@]}" .DEFAULT 2>/dev/null |
             command sed -ne "$script"))
 
-        _comp_make__truncate_non_unique_paths
+        _comp_cmd_make__truncate_non_unique_paths
 
         if [[ $mode != -d ]]; then
             # Completion will occur if there is only one suggestion
@@ -239,6 +239,6 @@ _make()
 
     fi
 } &&
-    complete -F _make make gmake gnumake pmake colormake bmake
+    complete -F _comp_cmd_make make gmake gnumake pmake colormake bmake
 
 # ex: filetype=sh

completions/makepkg

@@ -1,7 +1,7 @@
 # makepkg completion                                       -*- shell-script -*-
 
 # Slackware Linux variant
-_makepkg_slackware()
+_comp_cmd_makepkg__slackware()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -23,7 +23,7 @@ _makepkg_slackware()
     _filedir
 }
 
-_makepkg_bootstrap()
+_comp_cmd_makepkg__bootstrap()
 {
     local fname help
 
@@ -32,17 +32,17 @@ _makepkg_bootstrap()
     help=$("$1" --help 2>&1)
     case ${help,,} in
         *slackware*)
-            fname=_makepkg_slackware
+            fname=_comp_cmd_makepkg__slackware
             ;;
         *)
             fname=_minimal
             ;;
     esac
 
-    unset -f _makepkg_bootstrap
+    unset -f "$FUNCNAME"
     complete -F $fname makepkg
     $fname "$@"
 } &&
-    complete -F _makepkg_bootstrap makepkg
+    complete -F _comp_cmd_makepkg__bootstrap makepkg
 
 # ex: filetype=sh

completions/man

@@ -1,6 +1,6 @@
 # man(1) completion                                        -*- shell-script -*-
 
-_man()
+_comp_cmd_man()
 {
     local cur prev words cword split comp_args
     _comp_initialize -s -n : -- "$@" || return
@@ -107,6 +107,6 @@ _man()
 
     __ltrim_colon_completions "$cur"
 } &&
-    complete -F _man man apropos whatis
+    complete -F _comp_cmd_man man apropos whatis
 
 # ex: filetype=sh

completions/mc

@@ -1,6 +1,6 @@
 # bash completion for mc                                   -*- shell-script -*-
 
-_mc()
+_comp_cmd_mc()
 {
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
@@ -26,6 +26,6 @@ _mc()
         _filedir -d
     fi
 } &&
-    complete -F _mc mc
+    complete -F _comp_cmd_mc mc
 
 # ex: filetype=sh

completions/mcrypt

@@ -1,7 +1,7 @@
 # mcrypt(1) completion                                     -*- shell-script -*-
 # by Ariel Fermani <[email protected]>
 
-_mcrypt()
+_comp_cmd_mcrypt()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -62,6 +62,6 @@ _mcrypt()
         fi
     fi
 } &&
-    complete -F _mcrypt mcrypt mdecrypt
+    complete -F _comp_cmd_mcrypt mcrypt mdecrypt
 
 # ex: filetype=sh

completions/mdadm

@@ -1,6 +1,6 @@
 # bash completion for mdadm                                -*- shell-script -*-
 
-_mdadm_raid_level()
+_comp_cmd_mdadm__raid_level()
 {
     local mode
 
@@ -32,7 +32,7 @@ _mdadm_raid_level()
     esac
 }
 
-_mdadm_raid_layout()
+_comp_cmd_mdadm__raid_layout()
 {
     local level
     for ((i = 1; i < cword; i++)); do
@@ -58,18 +58,18 @@ _mdadm_raid_layout()
     esac
 }
 
-_mdadm_auto_flag()
+_comp_cmd_mdadm__auto_flag()
 {
     COMPREPLY=($(compgen -W 'no yes md mdp part p' -- "$cur"))
 }
 
-_mdadm_update_flag()
+_comp_cmd_mdadm__update_flag()
 {
     COMPREPLY=($(compgen -W 'sparc2.2 summaries uuid name homehost resync
         byteorder super-minor' -- "$cur"))
 }
 
-_mdadm()
+_comp_cmd_mdadm()
 {
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
@@ -82,19 +82,19 @@ _mdadm()
             return
             ;;
         --level | -${noargopts}l)
-            _mdadm_raid_level
+            _comp_cmd_mdadm__raid_level
             return
             ;;
         --layout | --parity | -${noargopts}p)
-            _mdadm_raid_layout
+            _comp_cmd_mdadm__raid_layout
             return
             ;;
         --auto | -${noargopts}a)
-            _mdadm_auto_flag
+            _comp_cmd_mdadm__auto_flag
             return
             ;;
         --update | -${noargopts}U)
-            _mdadm_update_flag
+            _comp_cmd_mdadm__update_flag
             return
             ;;
     esac
@@ -149,6 +149,6 @@ _mdadm()
         _filedir
     fi
 } &&
-    complete -F _mdadm mdadm
+    complete -F _comp_cmd_mdadm mdadm
 
 # ex: filetype=sh

completions/mdtool

@@ -1,6 +1,6 @@
 # mdtool completion                                        -*- shell-script -*-
 
-_mdtool()
+_comp_cmd_mdtool()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -56,6 +56,6 @@ _mdtool()
         generate-makefiles gettext-update setup -q' -- "$cur"))
 
 } &&
-    complete -F _mdtool mdtool
+    complete -F _comp_cmd_mdtool mdtool
 
 # ex: filetype=sh

completions/medusa

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