thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1088

Browse Source 
Problem:    Coverity warns for uninitialized variables.  Only one is an actual
            problem.
Solution:   Move the conditions.  Don't use endpos if handling an error.
This commit is contained in:
Bram Moolenaar
2016-01-12 21:00:40 +01:00
parent d79e55016c
commit 7ae4fbca55
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/ops.c
View File

@@ -5371,9 +5371,9 @@ op_addsub(oap, Prenum1, g_cmd)
} }
else else
{ {
int one_change; int one_change;
int length; int length;
pos_T startpos; pos_T startpos;
if (u_save((linenr_T)(oap->start.lnum - 1), if (u_save((linenr_T)(oap->start.lnum - 1),
(linenr_T)(oap->end.lnum + 1)) == FAIL) (linenr_T)(oap->end.lnum + 1)) == FAIL)
@@ -5388,32 +5388,29 @@ op_addsub(oap, Prenum1, g_cmd)
pos.col = bd.textcol; pos.col = bd.textcol;
length = bd.textlen; length = bd.textlen;
} }
else else if (oap->motion_type == MLINE)
{ {
if (oap->motion_type == MLINE) curwin->w_cursor.col = 0;
pos.col = 0;
length = (colnr_T)STRLEN(ml_get(pos.lnum));
}
else /* oap->motion_type == MCHAR */
{
if (!oap->inclusive)
dec(&(oap->end));
length = (colnr_T)STRLEN(ml_get(pos.lnum));
pos.col = 0;
if (pos.lnum == oap->start.lnum)
{ {
curwin->w_cursor.col = 0; pos.col += oap->start.col;
pos.col = 0; length -= oap->start.col;
length = (colnr_T)STRLEN(ml_get(pos.lnum));
} }
else if (oap->motion_type == MCHAR) if (pos.lnum == oap->end.lnum)
{ {
if (!oap->inclusive) length = (int)STRLEN(ml_get(oap->end.lnum));
dec(&(oap->end)); if (oap->end.col >= length)
length = (colnr_T)STRLEN(ml_get(pos.lnum)); oap->end.col = length - 1;
pos.col = 0; length = oap->end.col - pos.col + 1;
if (pos.lnum == oap->start.lnum)
{
pos.col += oap->start.col;
length -= oap->start.col;
}
if (pos.lnum == oap->end.lnum)
{
length = (int)STRLEN(ml_get(oap->end.lnum));
if (oap->end.col >= length)
oap->end.col = length - 1;
length = oap->end.col - pos.col + 1;
}
} }
} }
one_change = do_addsub(oap->op_type, &pos, length, amount); one_change = do_addsub(oap->op_type, &pos, length, amount);
@@ -5493,7 +5490,7 @@ do_addsub(op_type, pos, length, Prenum1)
int was_positive = TRUE; int was_positive = TRUE;
int visual = VIsual_active; int visual = VIsual_active;
int did_change = FALSE; int did_change = FALSE;
pos_T t = curwin->w_cursor; pos_T save_cursor = curwin->w_cursor;
int maxlen = 0; int maxlen = 0;
pos_T startpos; pos_T startpos;
pos_T endpos; pos_T endpos;
@@ -5819,9 +5816,6 @@ do_addsub(op_type, pos, length, Prenum1)
--curwin->w_cursor.col; --curwin->w_cursor.col;
} }
theend:
if (visual)
curwin->w_cursor = t;
if (did_change) if (did_change)
{ {
/* set the '[ and '] marks */ /* set the '[ and '] marks */
@@ -5831,6 +5825,10 @@ theend:
--curbuf->b_op_end.col; --curbuf->b_op_end.col;
} }
theend:
if (visual)
curwin->w_cursor = save_cursor;
return did_change; return did_change;
} }

2
src/version.c
View File

@@ -741,6 +741,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 */
/**/
1088,
/**/ /**/
1087, 1087,
/**/ /**/