diff options
-rw-r--r-- | Functions/Zftp/zfinit | 4 | ||||
-rw-r--r-- | Src/Modules/zutil.c | 2 | ||||
-rw-r--r-- | Src/loop.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Functions/Zftp/zfinit b/Functions/Zftp/zfinit index 60d116607..4f6bbc854 100644 --- a/Functions/Zftp/zfinit +++ b/Functions/Zftp/zfinit @@ -2,7 +2,7 @@ emulate -L zsh [[ $1 = -n ]] || zmodload -e zsh/zftp || zmodload -ia zsh/zftp zftp || return 1 -if zmodload -i zutil; then +if zmodload -i zsh/zutil; then local arr # Set defaults for styles if none set. zstyle -g arr ':zftp:*' progress || zstyle ':zftp:*' progress bar @@ -31,7 +31,7 @@ autoload -U zfstat zftp_chpwd zftp_progress zftransfer zftype zfuget zfuput # zftp completions: only use these if new-style completion is not # active. # -if [[ ${#_patcomps} -eq 0 || -z ${_patcomps[(r)zf*]} ]]; then +if [[ ${#_patcomps} -eq 0 || -z ${_patcomps[(r)_zf*]} ]]; then # only way of getting that noglob out of the way: this is unnecessary with # widget-based completion setopt completealiases diff --git a/Src/Modules/zutil.c b/Src/Modules/zutil.c index e5e1bf57e..026d98ba3 100644 --- a/Src/Modules/zutil.c +++ b/Src/Modules/zutil.c @@ -785,7 +785,7 @@ rparseelt(RParseResult *result, jmp_buf *perr) RParseState *st; RParseBranch *br; char *pattern, *lookahead; - int patternlen, lookaheadlen; + int patternlen, lookaheadlen = 0; l = strlen(s); if (!((2 <= l && s[l - 1] == '/') || diff --git a/Src/loop.c b/Src/loop.c index f2958114c..dcdd79e13 100644 --- a/Src/loop.c +++ b/Src/loop.c @@ -52,9 +52,9 @@ execfor(Estate state, int do_exec) Wordcode end, loop; wordcode code = state->pc[-1]; int iscond = (WC_FOR_TYPE(code) == WC_FOR_COND); - char *name, *str, *cond, *advance; + char *name, *str, *cond = NULL, *advance = NULL; zlong val = 0; - LinkList args; + LinkList args = NULL; name = ecgetstr(state, 0); end = state->pc + WC_FOR_SKIP(code); |