vim-patch:8.0.1753: fix various warnings #10639

vim-patch:8.0.1753: various warnings from a static analyser
Problem:    Various warnings from a static analyser
Solution:   Remove unneeded conditions.
1c17ffa461
This commit is contained in:
Ihor Antonov 2019-07-28 15:26:17 -04:00 committed by Justin M. Keyes
parent 6953e151bb
commit 3b82c075b3
2 changed files with 10 additions and 10 deletions

View File

@ -15175,15 +15175,15 @@ static void set_buffer_lines(buf_T *buf, linenr_T lnum, typval_T *lines,
} }
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
* undone separately from what was previously inserted. */ // undone separately from what was previously inserted.
if (u_sync_once == 2) { if (u_sync_once == 2) {
u_sync_once = 1; /* notify that u_sync() was called */ u_sync_once = 1; // notify that u_sync() was called
u_sync(TRUE); u_sync(true);
} }
if (lnum <= curbuf->b_ml.ml_line_count) { if (lnum <= curbuf->b_ml.ml_line_count) {

View File

@ -3448,7 +3448,7 @@ int map_to_exists_mode(const char *const rhs, const int mode, const bool abbr)
{ {
mapblock_T *mp; mapblock_T *mp;
int hash; int hash;
bool expand_buffer = false; bool exp_buffer = false;
validate_maphash(); validate_maphash();
@ -3459,12 +3459,12 @@ int map_to_exists_mode(const char *const rhs, const int mode, const bool abbr)
if (hash > 0) { // There is only one abbr list. if (hash > 0) { // There is only one abbr list.
break; break;
} }
if (expand_buffer) { if (exp_buffer) {
mp = curbuf->b_first_abbr; mp = curbuf->b_first_abbr;
} else { } else {
mp = first_abbr; mp = first_abbr;
} }
} else if (expand_buffer) { } else if (exp_buffer) {
mp = curbuf->b_maphash[hash]; mp = curbuf->b_maphash[hash];
} else { } else {
mp = maphash[hash]; mp = maphash[hash];
@ -3476,10 +3476,10 @@ int map_to_exists_mode(const char *const rhs, const int mode, const bool abbr)
} }
} }
} }
if (expand_buffer) { if (exp_buffer) {
break; break;
} }
expand_buffer = true; exp_buffer = true;
} }
return false; return false;