diff options
| author | rover <pathfinder2013@126.com> | 2017-01-01 21:30:32 +0800 |
|---|---|---|
| committer | rover <pathfinder2013@126.com> | 2017-01-01 23:18:30 +0800 |
| commit | 13e2e2207354d940921dd5a95e322715b74c06a4 (patch) | |
| tree | a671ce7861dd371f70fe3e1e2b1ec9921431a735 | |
| parent | 67056529281efabb41050b9840ce5649a7e6e7a3 (diff) | |
| download | rneovim-13e2e2207354d940921dd5a95e322715b74c06a4.tar.gz rneovim-13e2e2207354d940921dd5a95e322715b74c06a4.tar.bz2 rneovim-13e2e2207354d940921dd5a95e322715b74c06a4.zip | |
vim-patch:7.4.2028
Problem: cppcheck warns for using index before limits check.
Solution: Swap the expressions. (Dominique Pelle)
https://github.com/vim/vim/commit/5498a41f5a62c3877fee0185adf3bf7245a9a547
| -rw-r--r-- | src/nvim/mbyte.c | 9 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index e8b1131767..ec4969d4f6 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -2109,13 +2109,14 @@ char_u * enc_locale(void) } else s = p + 1; } - for (i = 0; s[i] != NUL && i < (int)sizeof(buf) - 1; ++i) { - if (s[i] == '_' || s[i] == '-') + for (i = 0; i < (int)sizeof(buf) - 1 && s[i] != NUL; i++) { + if (s[i] == '_' || s[i] == '-') { buf[i] = '-'; - else if (isalnum((int)s[i])) + } else if (isalnum((int)s[i])) { buf[i] = TOLOWER_ASC(s[i]); - else + } else { break; + } } buf[i] = NUL; diff --git a/src/nvim/version.c b/src/nvim/version.c index 9ad40cddd2..8497d213e7 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -412,7 +412,7 @@ static int included_patches[] = { // 2031, // 2030 NA // 2029, - // 2028, + 2028, // 2027 NA // 2026 NA // 2025 NA |