Permalink
Browse files

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)
  • Loading branch information...
brammool committed Apr 24, 2018
1 parent a2aa8a2 commit 1c17ffa4611f4efe68c61f7cdd9ed692a866ba75
Showing with 15 additions and 13 deletions.
  1. +1 −1 src/evalfunc.c
  2. +1 −1 src/ex_cmds2.c
  3. +1 −1 src/fileio.c
  4. +5 −5 src/getchar.c
  5. +1 −1 src/normal.c
  6. +1 −1 src/os_unix.c
  7. +1 −1 src/search.c
  8. +2 −2 src/term.c
  9. +2 −0 src/version.c
@@ -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 */
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;
/* When coming here from Insert mode, sync undo, so that this can be
@@ -1420,7 +1420,7 @@ check_due_timer(void)
if (balloonEval != NULL)
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;
}
#endif
@@ -1392,7 +1392,7 @@ readfile(
/* If the crypt layer is buffering, not producing
* anything yet, need to read more. */
if (size > 0 && decrypted_size == 0)
if (decrypted_size == 0)
continue;
if (linerest == 0)
@@ -4119,7 +4119,7 @@ map_to_exists_mode(char_u *rhs, int mode, int abbr)
mapblock_T *mp;
int hash;
# ifdef FEAT_LOCALMAP
int expand_buffer = FALSE;
int exp_buffer = FALSE;
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 */
break;
#ifdef FEAT_LOCALMAP
if (expand_buffer)
if (exp_buffer)
mp = curbuf->b_first_abbr;
else
#endif
mp = first_abbr;
}
# ifdef FEAT_LOCALMAP
else if (expand_buffer)
else if (exp_buffer)
mp = curbuf->b_maphash[hash];
# endif
else
@@ -4154,9 +4154,9 @@ map_to_exists_mode(char_u *rhs, int mode, int abbr)
}
}
# ifdef FEAT_LOCALMAP
if (expand_buffer)
if (exp_buffer)
break;
expand_buffer = TRUE;
exp_buffer = TRUE;
}
# endif
@@ -2610,7 +2610,7 @@ do_mouse(
end_visual_mode();
}
}
else if (c1 < 0)
else
{
tabpage_T *tp;
@@ -441,7 +441,7 @@ mch_inchar(
/* no character available within "wtime" */
return 0;
if (wtime < 0)
else
{
/* no character available within 'updatetime' */
did_start_blocking = TRUE;
@@ -4071,7 +4071,7 @@ current_tagblock(
goto again;
}
if (do_include || r < 1)
if (do_include)
{
/* Include up to the '>'. */
while (*ml_get_cursor() != '>')
@@ -2361,7 +2361,7 @@ term_7to8bit(char_u *p)
return 0;
}
#ifdef FEAT_GUI
#if defined(FEAT_GUI) || defined(PROTO)
int
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_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. */
*x = winpos_x;
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1753,
/**/
1752,
/**/

0 comments on commit 1c17ffa

Please sign in to comment.