summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2008-10-10 13:20:05 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2008-10-10 13:20:05 +0000
commit198a53dd46ee8cf48eefa70aa51a821139b505b1 (patch)
tree54cb4fcc76ed335f8028e05a2ce95a18632f30e1
parent8cc1fe70817d5f743d201355603347931c25a729 (diff)
downloadzsh-198a53dd46ee8cf48eefa70aa51a821139b505b1.tar.gz
zsh-198a53dd46ee8cf48eefa70aa51a821139b505b1.tar.xz
zsh-198a53dd46ee8cf48eefa70aa51a821139b505b1.zip
unposted: silence some warnings when WARN_CREATE_GLOBAL is set
-rw-r--r--ChangeLog4
-rw-r--r--Functions/Zftp/zffcache2
-rw-r--r--Functions/Zftp/zftp_progress2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 02616a860..b9a53951c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-10-10  Peter Stephenson  <pws@csr.com>
 
+	* unposted: Functions/Zftp/zffcache,
+	Functions/Zftp/zftp_progroess: silence some warnings when
+	WARN_CREATE_GLOBAL is set.
+
 	* unposted: Config/version.mk: 4.3.6-dev-1.
 
 	* unposted: Test/B06fc.ztst: use -f flag to zsh to prevent
diff --git a/Functions/Zftp/zffcache b/Functions/Zftp/zffcache
index 0d9686660..48afdcba0 100644
--- a/Functions/Zftp/zffcache
+++ b/Functions/Zftp/zffcache
@@ -2,6 +2,8 @@
 # storing it in fcache_name, then generate the cache for the current
 # directory, or with argument -d clear the cache.
 
+[[ $1 = -d ]] && local fcache_name
+
 fcache_name=$zfconfig[fcache_$ZFTP_SESSION]
 if [[ -z $fcache_name ]]; then
   local vals
diff --git a/Functions/Zftp/zftp_progress b/Functions/Zftp/zftp_progress
index cc6195661..6bc873288 100644
--- a/Functions/Zftp/zftp_progress
+++ b/Functions/Zftp/zftp_progress
@@ -48,7 +48,7 @@ if [[ -n $ZFTP_TRANSFER ]]; then
     unset zftpseconds
     print 1>&2
   else
-    zftpseconds=$SECONDS
+    typeset -g zftpseconds=$SECONDS
   fi
 fi
 # }