diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-17 22:02:46 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-04-17 22:02:46 +0200 |
| commit | ce7cba6d7f36e79d52825215ba7b6848397b0440 (patch) | |
| tree | cf249b863e9bfa1a6943b91dc293cc38bf71f6a7 /src/nvim/regexp.c | |
| parent | 7debba9d4295f09bc338a5f0718abdc54d565a56 (diff) | |
| parent | 2eb9150a4fcb8f43599e5f470cbcb3a12195d910 (diff) | |
| download | rneovim-ce7cba6d7f36e79d52825215ba7b6848397b0440.tar.gz rneovim-ce7cba6d7f36e79d52825215ba7b6848397b0440.tar.bz2 rneovim-ce7cba6d7f36e79d52825215ba7b6848397b0440.zip | |
Merge #6533 'Fix PVS-studio warnings'
Diffstat (limited to 'src/nvim/regexp.c')
| -rw-r--r-- | src/nvim/regexp.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 4b5e17b00b..7be89c2d7e 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -2398,7 +2398,7 @@ collection: regc('\b'); break; case CLASS_ESCAPE: - regc('\033'); + regc(ESC); break; } } else { @@ -2923,13 +2923,8 @@ static void skipchr(void) else prevchr_len = 0; if (regparse[prevchr_len] != NUL) { - if (enc_utf8) - /* exclude composing chars that mb_ptr2len does include */ - prevchr_len += utf_ptr2len(regparse + prevchr_len); - else if (has_mbyte) - prevchr_len += (*mb_ptr2len)(regparse + prevchr_len); - else - ++prevchr_len; + // Exclude composing chars that utfc_ptr2len does include. + prevchr_len += utf_ptr2len(regparse + prevchr_len); } regparse += prevchr_len; prev_at_start = at_start; @@ -3052,7 +3047,7 @@ static int getoctchrs(void) int c; int i; - for (i = 0; i < 3 && nr < 040; ++i) { + for (i = 0; i < 3 && nr < 040; i++) { // -V536 c = regparse[0]; if (c < '0' || c > '7') break; |