diff options
author | Bram Moolenaar <Bram@vim.org> | 2013-06-09 20:51:00 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2013-06-09 20:51:00 +0200 |
commit | 4380d1ea239fe7f2546b7cad4ad0c424f0f5979a (patch) | |
tree | f6aba518b975d15c8ac6b5a12d829d9b0923c332 | |
parent | 11354759e2c35616ea7a4daef0b05337846adf76 (diff) | |
download | vim-git-4380d1ea239fe7f2546b7cad4ad0c424f0f5979a.tar.gz |
updated for version 7.3.1156v7.3.1156
Problem: Compiler warnings. (dv1445)
Solution: Initialize variables, even when the value isn't really used.
-rw-r--r-- | src/eval.c | 2 | ||||
-rw-r--r-- | src/regexp_nfa.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index da3d2bd79..7250556fc 100644 --- a/src/eval.c +++ b/src/eval.c @@ -2734,6 +2734,8 @@ get_lval(name, rettv, lp, unlet, skip, quiet, fne_flags) prevval = key[len]; key[len] = NUL; } + else + prevval = 0; /* avoid compiler warning */ wrong = (lp->ll_dict->dv_scope == VAR_DEF_SCOPE && rettv->v_type == VAR_FUNC && var_check_func_name(key, lp->ll_di == NULL)) diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 7e9b04ca7..9a89b49ec 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -3045,7 +3045,7 @@ post2nfa(postfix, end, nfa_calc_size) start_state = NFA_START_INVISIBLE_BEFORE_NEG; end_state = NFA_END_INVISIBLE_NEG; break; - case NFA_PREV_ATOM_LIKE_PATTERN: + default: /* NFA_PREV_ATOM_LIKE_PATTERN: */ start_state = NFA_START_PATTERN; end_state = NFA_END_PATTERN; break; @@ -4853,7 +4853,7 @@ nfa_regmatch(prog, start, submatch, m) nfa_state_T *add_state; int add_here; int add_count; - int add_off; + int add_off = 0; int toplevel = start->c == NFA_MOPEN; #ifdef NFA_REGEXP_DEBUG_LOG FILE *debug = fopen(NFA_REGEXP_DEBUG_LOG, "a"); diff --git a/src/version.c b/src/version.c index 6e419dd14..3b2fc8340 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1156, +/**/ 1155, /**/ 1154, |