42171: prevent parameters of various parameters from becoming global

11 files changed, 11 insertions, 10 deletions

diff --git a/Completion/Unix/Command/_arp b/Completion/Unix/Command/_arp
index 80e829022..5b047b2b8 100644
--- a/Completion/Unix/Command/_arp
+++ b/Completion/Unix/Command/_arp
@@ -2,7 +2,7 @@
 
 local state line expl curcontext="$curcontext" ret=1
 typeset -A opt_args
-local -a cmds args
+local -a cmds args vopt flags
 
 flags=( temp pub )
 cmds=(
diff --git a/Completion/Unix/Command/_cvs b/Completion/Unix/Command/_cvs
index 0552d2175..cba3eb773 100644
--- a/Completion/Unix/Command/_cvs
+++ b/Completion/Unix/Command/_cvs
@@ -882,7 +882,7 @@ _cvs_modified_entries() {
 }
 
 (( $+_cvs_ignore_default )) ||
-_cvs_ignore_default=(
+local _cvs_ignore_default=(
   RCS SCCS CVS CVS.adm RCSLOG 'cvslog.*' tags TAGS .make.state .nse_depinfo
   '*\~' '\#*' '.\#*' ',*' '_$*' '*$' '*.old' '*.bak' '*.BAK' '*.orig' '*.rej'
   '.del-*' '*.a' '*.olb' '*.o' '*.obj' '*.so' '*.exe' '*.Z' '*.elc' '*.ln'
diff --git a/Completion/Unix/Command/_devtodo b/Completion/Unix/Command/_devtodo
index 2380399b9..8363495cd 100644
--- a/Completion/Unix/Command/_devtodo
+++ b/Completion/Unix/Command/_devtodo
@@ -5,7 +5,7 @@ typeset -a arg_generic arg_add todo_opts \
            priorities
 typeset -A arg_pair arg_desc
 typeset -i i
-typeset expl
+typeset expl arg
 
 for ((i=2; i <= $#words; i++)) {
 	if [[ $words[$i] == '--database' ]]; then
diff --git a/Completion/Unix/Command/_ffmpeg b/Completion/Unix/Command/_ffmpeg
index d68a094d4..c0b229f35 100644
--- a/Completion/Unix/Command/_ffmpeg
+++ b/Completion/Unix/Command/_ffmpeg
@@ -100,7 +100,7 @@ typeset -A _ffmpeg_flags
 
 local -a _ffmpeg_argspecs
 {
-    local lastopt
+    local lastopt REPLY
     local lastopt_description
     local lastopt_takesargs
     local lastopt_type
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 8e3b0eb3d..a46da5b3c 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -7727,7 +7727,7 @@ for file in ${^fpath}/_git-*~(*~|*.zwc)(-.N); do
     continue
   fi
 
-  local desc=
+  local desc= input
   integer i=1
   while read input; do
     if (( i == 2 )); then
diff --git a/Completion/Unix/Command/_gpg b/Completion/Unix/Command/_gpg
index 239a032a1..48a36eff2 100644
--- a/Completion/Unix/Command/_gpg
+++ b/Completion/Unix/Command/_gpg
@@ -1,7 +1,7 @@
 #compdef gpg gpgv gpg-zip gpg2=gpg
 
 local curcontext="$curcontext" state line expl ret=1
-local -a args allopts dups
+local -a args allopts dups extra
 typeset -A opt_args
 
 if [[ $service = gpg-zip ]]; then
diff --git a/Completion/Unix/Command/_ruby b/Completion/Unix/Command/_ruby
index bb0558fde..7f7af8776 100644
--- a/Completion/Unix/Command/_ruby
+++ b/Completion/Unix/Command/_ruby
@@ -2,7 +2,7 @@
 
 local curcontext="$curcontext" state line expl desc RUBY ret=1
 typeset -A opt_args
-local -a opts irb all common charsets suf
+local -a opts irb erb all common charsets suf
 
 all=(
   '*-r+[require the library before executing your script]:library name:->library'
diff --git a/Completion/Unix/Command/_tr b/Completion/Unix/Command/_tr
index d55fab5ff..efa3d4c91 100644
--- a/Completion/Unix/Command/_tr
+++ b/Completion/Unix/Command/_tr
@@ -1,7 +1,7 @@
 #compdef tr
 
 local curcontext="$curcontext" state line expl ret=1
-local args variant
+local args variant k
 local -A descr
 descr=(
   -c '[complement characters specified by first string]'
diff --git a/Completion/Unix/Command/_whois b/Completion/Unix/Command/_whois
index 2dd04f9cd..a8180f60e 100644
--- a/Completion/Unix/Command/_whois
+++ b/Completion/Unix/Command/_whois
@@ -1,6 +1,7 @@
 #compdef whois fwhois
 
 _whois () {
+  local _whois_comp
   _whois_setup
   case "$0" in
   fwhois) _whois_fwhois;;
diff --git a/Completion/Unix/Command/_yp b/Completion/Unix/Command/_yp
index 104a0b4df..b7619a02e 100644
--- a/Completion/Unix/Command/_yp
+++ b/Completion/Unix/Command/_yp
@@ -1,6 +1,6 @@
 #compdef ypcat ypmatch yppasswd ypwhich ypset ypserv ypbind yppush yppoll ypxfr domainname
 
-local curcontext="$curcontext" line state expl ret=1
+local curcontext="$curcontext" line state expl ret=1 _yp_cache_nicks _yp_args
 typeset -A opt_args
 
 if (( ! $+_yp_cache_maps )); then
diff --git a/Completion/Unix/Command/_zfs b/Completion/Unix/Command/_zfs
index 553996da0..ce5df5877 100644
--- a/Completion/Unix/Command/_zfs
+++ b/Completion/Unix/Command/_zfs
@@ -6,7 +6,7 @@ _zfs() {
 	typeset -A opt_args
 	local -a subcmds rw_properties rw_propnames ro_properties create_properties
 	local -a share_nfs_ro_properties share_nfs_rw_properties
-	local -a share_smb_ro_properties share_nfs_rw_properties
+	local -a share_smb_ro_properties share_smb_rw_properties
 	local -a share_ro_properties share_rw_properties
 	local -a difffields delegatable_perms