refactor(_comp_get_first_arg): return result via ret

Author: akinomyoga

bash_completion

@@ -2136,19 +2136,19 @@ _comp_realcommand()
 }
 
 # This function returns the first argument, excluding options
-# @var[out] arg First argument if any, or otherwise an empty string
+# @var[out] ret First argument if any, or otherwise an empty string
 # @since 2.12
 _comp_get_first_arg()
 {
     local i
 
-    arg=
+    ret=
     for ((i = 1; i < cword; i++)); do
         if [[ ${words[i]} != -?* ]]; then
-            arg=${words[i]}
+            ret=${words[i]}
             break
         elif [[ ${words[i]} == -- ]]; then
-            ((i + 1 < cword)) && arg=${words[i + 1]}
+            ((i + 1 < cword)) && ret=${words[i + 1]}
             break
         fi
     done

bash_completion.d/000_bash_completion_compat.bash

@@ -402,7 +402,8 @@ _fstypes()
 # @deprecated 2.12 Use `_comp_get_first_arg`.  Note that the new function
 # `_comp_get_first_arg` operates on `words` and `cword` instead of `COMP_WORDS`
 # and `COMP_CWORD`.  The new function considers a command-line argument after
-# `--` as an argument.
+# `--` as an argument.  The new function returns the result in variable `ret`
+# instead of `arg`.
 _get_first_arg()
 {
     local i

completions/cryptsetup

@@ -34,8 +34,9 @@ _comp_cmd_cryptsetup()
 
     [[ $was_split ]] && return
 
-    local arg
+    local ret
     _comp_get_first_arg
+    local arg=$ret
     if [[ ! $arg ]]; then
         if [[ $cur == -* ]]; then
             _comp_compgen_help
@@ -47,7 +48,6 @@ _comp_cmd_cryptsetup()
                 luksResume luksHeaderBackup luksHeaderRestore'
         fi
     else
-        local ret
         _comp_count_args "" "-${noargopts}[chslSbopitTdM]"
         local args=$ret
         case $arg in

completions/hcitool

@@ -45,18 +45,17 @@ _comp_cmd_hcitool()
 
     [[ $was_split ]] && return
 
-    local arg
+    local ret
     _comp_get_first_arg
-    if [[ ! $arg ]]; then
+    if [[ ! $ret ]]; then
         if [[ $cur == -* ]]; then
             _comp_compgen_help
         else
             _comp_compgen -- -W 'dev inq scan name info spinq epinq cmd con cc
                 dc sr cpt rssi lq tpl afh lst auth enc key clkoff clock'
         fi
     else
-        local ret
-        case $arg in
+        case $ret in
             name | info | dc | rssi | lq | afh | auth | key | clkoff | lst)
                 _comp_count_args
                 if ((ret == 2)); then
@@ -116,17 +115,17 @@ _comp_cmd_sdptool()
 
     [[ $was_split ]] && return
 
-    local arg
+    local ret
     _comp_get_first_arg
-    if [[ ! $arg ]]; then
+    if [[ ! $ret ]]; then
         if [[ $cur == -* ]]; then
             _comp_compgen_help
         else
             _comp_compgen -- -W 'search browse records add del get setattr
                 setseq'
         fi
     else
-        case $arg in
+        case $ret in
             search)
                 if [[ $cur == -* ]]; then
                     _comp_compgen -- -W '--bdaddr --tree --raw --xml'
@@ -198,16 +197,16 @@ _comp_cmd_rfcomm()
             ;;
     esac
 
-    local arg
+    local ret
     _comp_get_first_arg
+    local arg=$ret
     if [[ ! $arg ]]; then
         if [[ $cur == -* ]]; then
             _comp_compgen_help
         else
             _comp_compgen -- -W 'show connect listen watch bind release'
         fi
     else
-        local ret
         _comp_count_args
         local args=$ret
         if ((args == 2)); then
@@ -238,16 +237,16 @@ _comp_cmd_ciptool()
             ;;
     esac
 
-    local arg
+    local ret
     _comp_get_first_arg
-    if [[ ! $arg ]]; then
+    if [[ ! $ret ]]; then
         if [[ $cur == -* ]]; then
             _comp_compgen_help
         else
             _comp_compgen -- -W 'show search connect release loopback'
         fi
     else
-        case $arg in
+        case $ret in
             connect | release | loopback)
                 local ret
                 _comp_count_args
@@ -294,9 +293,9 @@ _comp_cmd_hciconfig()
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
 
-    local arg
+    local ret
     _comp_get_first_arg
-    if [[ ! $arg ]]; then
+    if [[ ! $ret ]]; then
         if [[ $cur == -* ]]; then
             _comp_compgen -- -W '--help --all'
         else
@@ -307,8 +306,7 @@ _comp_cmd_hciconfig()
                 version revision lm'
         fi
     else
-        local ret
-        case $arg in
+        case $ret in
             putkey | delkey)
                 _comp_count_args
                 if ((ret == 2)); then