bash-completion: use a better definition of __contains_word

- scope the iterator var
- use the correct, quoted, non-expansion prone positional parameter
  notation
- prevent expansion on RHS of comparison
- remove unneeded explicit returns.

This really should be defined only once...

shell-completion/bash/hostnamectl

@@ -18,9 +18,10 @@
 # along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 __contains_word () {
-        local word=$1; shift
+        local w word=$1; shift
-        for w in $*; do [[ $w = $word ]] && return 0; done
+        for w in "$@"; do
-        return 1
+                [[ $w = "$word" ]] && return
+        done
 }
 
 _hostnamectl() {

shell-completion/bash/journalctl

@@ -18,9 +18,10 @@
 # along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 __contains_word () {
-        local word=$1; shift
+        local w word=$1; shift
-        for w in $*; do [[ $w = $word ]] && return 0; done
+        for w in "$@"; do
-        return 1
+                [[ $w = "$word" ]] && return
+        done
 }
 
 __journal_fields=(MESSAGE{,_ID} PRIORITY CODE_{FILE,LINE,FUNC}

shell-completion/bash/localectl

@@ -18,9 +18,10 @@
 # along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 __contains_word () {
-        local word=$1; shift
+        local w word=$1; shift
-        for w in $*; do [[ $w = $word ]] && return 0; done
+        for w in "$@"; do
-        return 1
+                [[ $w = "$word" ]] && return
+        done
 }
 
 _localectl() {

shell-completion/bash/loginctl

@@ -18,9 +18,10 @@
 # along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 __contains_word () {
-        local word=$1; shift
+        local w word=$1; shift
-        for w in $*; do [[ $w = $word ]] && return 0; done
+        for w in "$@"; do
-        return 1
+                [[ $w = "$word" ]] && return
+        done
 }
 
 __get_all_sessions () { loginctl list-sessions | { while read -r a b; do printf "%s\n" "$a"; done; } ; }

shell-completion/bash/systemctl

@@ -32,9 +32,10 @@ __systemd_properties() {
 }
 
 __contains_word () {
-        local word=$1; shift
+        local w word=$1; shift
-        for w in $*; do [[ $w = $word ]] && return 0; done
+        for w in "$@"; do
-        return 1
+                [[ $w = "$word" ]] && return
+        done
 }
 
 __filter_units_by_property () {

shell-completion/bash/systemd-analyze

@@ -19,9 +19,10 @@
 # along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 __contains_word () {
-        local word=$1; shift
+        local w word=$1; shift
-        for w in $*; do [[ $w = $word ]] && return 0; done
+        for w in "$@"; do
-        return 1
+                [[ $w = "$word" ]] && return
+        done
 }
 
 _systemd_analyze() {

shell-completion/bash/systemd-coredumpctl

@@ -18,9 +18,10 @@
 # along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 __contains_word () {
-        local word=$1; shift
+        local w word=$1; shift
-        for w in $*; do [[ $w = $word ]] && return 0; done
+        for w in "$@"; do
-        return 1
+                [[ $w = "$word" ]] && return
+        done
 }
 
 __journal_fields=(MESSAGE{,_ID} PRIORITY CODE_{FILE,LINE,FUNC}

shell-completion/bash/timedatectl

@@ -18,9 +18,10 @@
 # along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 __contains_word () {
-        local word=$1; shift
+        local w word=$1; shift
-        for w in $*; do [[ $w = $word ]] && return 0; done
+        for w in "$@"; do
-        return 1
+                [[ $w = "$word" ]] && return
+        done
 }
 
 _timedatectl() {

shell-completion/bash/udevadm

@@ -18,9 +18,10 @@
 # along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 __contains_word () {
-        local word=$1; shift
+        local w word=$1; shift
-        for w in $*; do [[ $w = $word ]] && return 0; done
+        for w in "$@"; do
-        return 1
+                [[ $w = "$word" ]] && return
+        done
 }
 
 __get_all_sysdevs() {