Mercurial > vim
changeset 13762:9de2b25932eb v8.0.1753
patch 8.0.1753: various warnings from a static analyser
commit https://github.com/vim/vim/commit/1c17ffa4611f4efe68c61f7cdd9ed692a866ba75
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Apr 24 15:19:04 2018 +0200
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)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 24 Apr 2018 15:30:08 +0200 |
parents | ddd0ad66922b |
children | 3f6d9b05685d |
files | src/evalfunc.c src/ex_cmds2.c src/fileio.c src/getchar.c src/normal.c src/os_unix.c src/search.c src/term.c src/version.c |
diffstat | 9 files changed, 15 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -10194,7 +10194,7 @@ set_buffer_lines(buf_T *buf, linenr_T ln } 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
--- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -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
--- a/src/fileio.c +++ b/src/fileio.c @@ -1392,7 +1392,7 @@ retry: /* 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)
--- a/src/getchar.c +++ b/src/getchar.c @@ -4119,7 +4119,7 @@ map_to_exists_mode(char_u *rhs, int mode 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 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 } } # ifdef FEAT_LOCALMAP - if (expand_buffer) + if (exp_buffer) break; - expand_buffer = TRUE; + exp_buffer = TRUE; } # endif
--- a/src/normal.c +++ b/src/normal.c @@ -2610,7 +2610,7 @@ do_mouse( end_visual_mode(); } } - else if (c1 < 0) + else { tabpage_T *tp;
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -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;
--- a/src/search.c +++ b/src/search.c @@ -4071,7 +4071,7 @@ again: goto again; } - if (do_include || r < 1) + if (do_include) { /* Include up to the '>'. */ while (*ml_get_cursor() != '>')
--- a/src/term.c +++ b/src/term.c @@ -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, varnumbe 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;