1
0
forked from aniani/vim

updated for version 7.4a.031

Problem:    Compiler warnings. (Charles Campbell)
Solution:   Initialize variables even when not needed.
This commit is contained in:
Bram Moolenaar
2013-07-17 19:22:13 +02:00
parent 4a3aef7b28
commit de9149ef18
3 changed files with 13 additions and 3 deletions

View File

@@ -4060,9 +4060,13 @@ skip_add:
sub = &subs->norm; 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 /* Set the position (with "off" added) in the subexpression. Save
* and restore it when it was in use. Otherwise fill any gap. */ * and restore it when it was in use. Otherwise fill any gap. */
save_ptr = NULL;
if (REG_MULTI) if (REG_MULTI)
{ {
if (subidx < sub->in_use) if (subidx < sub->in_use)
@@ -4192,11 +4196,16 @@ skip_add:
sub->list.multi[subidx].end.col = sub->list.multi[subidx].end.col =
(colnr_T)(reginput - regline + off); (colnr_T)(reginput - regline + off);
} }
/* avoid compiler warnings */
save_ptr = NULL;
} }
else else
{ {
save_ptr = sub->list.line[subidx].end; save_ptr = sub->list.line[subidx].end;
sub->list.line[subidx].end = reginput + off; 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); subs = addstate(l, state->out, subs, pim, off);

View File

@@ -4509,7 +4509,7 @@ current_search(count, forward)
int result; /* result of various function calls */ int result; /* result of various function calls */
char_u old_p_ws = p_ws; char_u old_p_ws = p_ws;
int flags = 0; int flags = 0;
pos_T save_VIsual; pos_T save_VIsual = VIsual;
int one_char; int one_char;
/* wrapping should not occur */ /* wrapping should not occur */
@@ -4522,7 +4522,6 @@ current_search(count, forward)
if (VIsual_active) if (VIsual_active)
{ {
orig_pos = curwin->w_cursor; orig_pos = curwin->w_cursor;
save_VIsual = VIsual;
pos = curwin->w_cursor; pos = curwin->w_cursor;
start_pos = VIsual; start_pos = VIsual;

View File

@@ -727,6 +727,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
31,
/**/ /**/
30, 30,
/**/ /**/