Mercurial > vim
changeset 5210:839ebe7c1b2f v7.4a.031
updated for version 7.4a.031
Problem: Compiler warnings. (Charles Campbell)
Solution: Initialize variables even when not needed.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 17 Jul 2013 19:22:13 +0200 |
| parents | 9760cab5a463 |
| children | 9cb947f9aab3 |
| files | src/regexp_nfa.c src/search.c src/version.c |
| diffstat | 3 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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;