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_nfa.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_nfa.c')
| -rw-r--r-- | src/nvim/regexp_nfa.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index caf26fdd35..506e6277e9 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -2772,15 +2772,10 @@ static int nfa_max_width(nfa_state_T *startstate, int depth) case NFA_ANY: case NFA_START_COLL: case NFA_START_NEG_COLL: - /* matches some character, including composing chars */ - if (enc_utf8) - len += MB_MAXBYTES; - else if (has_mbyte) - len += 2; - else - ++len; + // Matches some character, including composing chars. + len += MB_MAXBYTES; if (state->c != NFA_ANY) { - /* skip over the characters */ + // Skip over the characters. state = state->out1->out; continue; } @@ -4412,8 +4407,9 @@ static int check_char_class(int class, int c) return OK; break; case NFA_CLASS_ESCAPE: - if (c == '\033') + if (c == ESC) { return OK; + } break; default: |