mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.0.1753: various warnings from a static analyser
Problem: Various warnings from a static analyser Solution: Add type casts, remove unneeded conditions. (Christian Brabandt, closes #2770)
This commit is contained in:
parent
a2aa8a2b22
commit
1c17ffa461
@ -10194,7 +10194,7 @@ set_buffer_lines(buf_T *buf, linenr_T lnum, typval_T *lines, typval_T *rettv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
rettv->vval.v_number = 1; /* FAIL */
|
rettv->vval.v_number = 1; /* FAIL */
|
||||||
if (line == NULL || lnum < 1 || lnum > curbuf->b_ml.ml_line_count + 1)
|
if (line == NULL || lnum > curbuf->b_ml.ml_line_count + 1)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* When coming here from Insert mode, sync undo, so that this can be
|
/* When coming here from Insert mode, sync undo, so that this can be
|
||||||
|
@ -1420,7 +1420,7 @@ check_due_timer(void)
|
|||||||
if (balloonEval != NULL)
|
if (balloonEval != NULL)
|
||||||
general_beval_cb(balloonEval, 0);
|
general_beval_cb(balloonEval, 0);
|
||||||
}
|
}
|
||||||
else if (this_due > 0 && (next_due == -1 || next_due > this_due))
|
else if (next_due == -1 || next_due > this_due)
|
||||||
next_due = this_due;
|
next_due = this_due;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -1392,7 +1392,7 @@ retry:
|
|||||||
|
|
||||||
/* If the crypt layer is buffering, not producing
|
/* If the crypt layer is buffering, not producing
|
||||||
* anything yet, need to read more. */
|
* anything yet, need to read more. */
|
||||||
if (size > 0 && decrypted_size == 0)
|
if (decrypted_size == 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (linerest == 0)
|
if (linerest == 0)
|
||||||
|
@ -4119,7 +4119,7 @@ map_to_exists_mode(char_u *rhs, int mode, int abbr)
|
|||||||
mapblock_T *mp;
|
mapblock_T *mp;
|
||||||
int hash;
|
int hash;
|
||||||
# ifdef FEAT_LOCALMAP
|
# ifdef FEAT_LOCALMAP
|
||||||
int expand_buffer = FALSE;
|
int exp_buffer = FALSE;
|
||||||
|
|
||||||
validate_maphash();
|
validate_maphash();
|
||||||
|
|
||||||
@ -4134,14 +4134,14 @@ map_to_exists_mode(char_u *rhs, int mode, int abbr)
|
|||||||
if (hash > 0) /* there is only one abbr list */
|
if (hash > 0) /* there is only one abbr list */
|
||||||
break;
|
break;
|
||||||
#ifdef FEAT_LOCALMAP
|
#ifdef FEAT_LOCALMAP
|
||||||
if (expand_buffer)
|
if (exp_buffer)
|
||||||
mp = curbuf->b_first_abbr;
|
mp = curbuf->b_first_abbr;
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
mp = first_abbr;
|
mp = first_abbr;
|
||||||
}
|
}
|
||||||
# ifdef FEAT_LOCALMAP
|
# ifdef FEAT_LOCALMAP
|
||||||
else if (expand_buffer)
|
else if (exp_buffer)
|
||||||
mp = curbuf->b_maphash[hash];
|
mp = curbuf->b_maphash[hash];
|
||||||
# endif
|
# endif
|
||||||
else
|
else
|
||||||
@ -4154,9 +4154,9 @@ map_to_exists_mode(char_u *rhs, int mode, int abbr)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
# ifdef FEAT_LOCALMAP
|
# ifdef FEAT_LOCALMAP
|
||||||
if (expand_buffer)
|
if (exp_buffer)
|
||||||
break;
|
break;
|
||||||
expand_buffer = TRUE;
|
exp_buffer = TRUE;
|
||||||
}
|
}
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
@ -2610,7 +2610,7 @@ do_mouse(
|
|||||||
end_visual_mode();
|
end_visual_mode();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (c1 < 0)
|
else
|
||||||
{
|
{
|
||||||
tabpage_T *tp;
|
tabpage_T *tp;
|
||||||
|
|
||||||
|
@ -441,7 +441,7 @@ mch_inchar(
|
|||||||
/* no character available within "wtime" */
|
/* no character available within "wtime" */
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (wtime < 0)
|
else
|
||||||
{
|
{
|
||||||
/* no character available within 'updatetime' */
|
/* no character available within 'updatetime' */
|
||||||
did_start_blocking = TRUE;
|
did_start_blocking = TRUE;
|
||||||
|
@ -4071,7 +4071,7 @@ again:
|
|||||||
goto again;
|
goto again;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (do_include || r < 1)
|
if (do_include)
|
||||||
{
|
{
|
||||||
/* Include up to the '>'. */
|
/* Include up to the '>'. */
|
||||||
while (*ml_get_cursor() != '>')
|
while (*ml_get_cursor() != '>')
|
||||||
|
@ -2361,7 +2361,7 @@ term_7to8bit(char_u *p)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef FEAT_GUI
|
#if defined(FEAT_GUI) || defined(PROTO)
|
||||||
int
|
int
|
||||||
term_is_gui(char_u *name)
|
term_is_gui(char_u *name)
|
||||||
{
|
{
|
||||||
@ -2823,7 +2823,7 @@ term_get_winpos(int *x, int *y, varnumber_T timeout)
|
|||||||
|
|
||||||
winpos_x = prev_winpos_x;
|
winpos_x = prev_winpos_x;
|
||||||
winpos_y = prev_winpos_y;
|
winpos_y = prev_winpos_y;
|
||||||
if (timeout < 10 && prev_winpos_y >= 0 && prev_winpos_y >= 0)
|
if (timeout < 10 && prev_winpos_y >= 0 && prev_winpos_x >= 0)
|
||||||
{
|
{
|
||||||
/* Polling: return previous values if we have them. */
|
/* Polling: return previous values if we have them. */
|
||||||
*x = winpos_x;
|
*x = winpos_x;
|
||||||
|
@ -761,6 +761,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 */
|
||||||
|
/**/
|
||||||
|
1753,
|
||||||
/**/
|
/**/
|
||||||
1752,
|
1752,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user