diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-07-17 19:22:13 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-07-17 19:22:13 +0200 |
| commit | de9149ef188b02b86d42a787d25583501f604cba (patch) | |
| tree | e868bc1836c9f832c801ceaeeea96b7cc5437ca3 | |
| parent | 4a3aef7b2837a6f8390b36ac49e5c01b4e90e2d1 (diff) | |
| download | vim-git-de9149ef188b02b86d42a787d25583501f604cba.tar.gz | |
updated for version 7.4a.031v7.4a.031
Problem: Compiler warnings. (Charles Campbell)
Solution: Initialize variables even when not needed.
| -rw-r--r-- | src/regexp_nfa.c | 11 | ||||
| -rw-r--r-- | src/search.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 02fe49ea1..f920e09b5 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -4060,9 +4060,13 @@ skip_add: sub = &subs->norm; } + /* avoid compiler warnings */ + save_ptr = NULL; + save_lpos.lnum = 0; + save_lpos.col = 0; + /* Set the position (with "off" added) in the subexpression. Save * and restore it when it was in use. Otherwise fill any gap. */ - save_ptr = NULL; if (REG_MULTI) { if (subidx < sub->in_use) @@ -4192,11 +4196,16 @@ skip_add: sub->list.multi[subidx].end.col = (colnr_T)(reginput - regline + off); } + /* avoid compiler warnings */ + save_ptr = NULL; } else { save_ptr = sub->list.line[subidx].end; sub->list.line[subidx].end = reginput + off; + /* avoid compiler warnings */ + save_lpos.lnum = 0; + save_lpos.col = 0; } subs = addstate(l, state->out, subs, pim, off); diff --git a/src/search.c b/src/search.c index b3ff18fa8..23dc27ea8 100644 --- a/src/search.c +++ b/src/search.c @@ -4509,7 +4509,7 @@ current_search(count, forward) int result; /* result of various function calls */ char_u old_p_ws = p_ws; int flags = 0; - pos_T save_VIsual; + pos_T save_VIsual = VIsual; int one_char; /* wrapping should not occur */ @@ -4522,7 +4522,6 @@ current_search(count, forward) if (VIsual_active) { orig_pos = curwin->w_cursor; - save_VIsual = VIsual; pos = curwin->w_cursor; start_pos = VIsual; diff --git a/src/version.c b/src/version.c index 65cd3b08f..e24106693 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 31, +/**/ 30, /**/ 29, |