diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-08-08 01:24:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 01:24:18 +0200 |
| commit | c06613d2f6c3f3a864c43e03b95d12efb3e0f4a6 (patch) | |
| tree | 3d052800def8498c4d26887b881f99e40bb38a46 /src/nvim/regexp_nfa.c | |
| parent | 1593ee7cf21f77168531c959fa9e73933b502d2e (diff) | |
| parent | 5cecd7a93aba83cd477519974fc33fadbdcfdc87 (diff) | |
| download | rneovim-c06613d2f6c3f3a864c43e03b95d12efb3e0f4a6.tar.gz rneovim-c06613d2f6c3f3a864c43e03b95d12efb3e0f4a6.tar.bz2 rneovim-c06613d2f6c3f3a864c43e03b95d12efb3e0f4a6.zip | |
Merge #8665 'Remove mb_ptr2char macro'
Diffstat (limited to 'src/nvim/regexp_nfa.c')
| -rw-r--r-- | src/nvim/regexp_nfa.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index 2eb0ca9313..deef3042d2 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -5030,16 +5030,8 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, * Run for each character. */ for (;; ) { - int curc; - int clen; - - if (has_mbyte) { - curc = (*mb_ptr2char)(reginput); - clen = (*mb_ptr2len)(reginput); - } else { - curc = *reginput; - clen = 1; - } + int curc = utf_ptr2char(reginput); + int clen = utfc_ptr2len(reginput); if (curc == NUL) { clen = 0; go_to_nextline = false; @@ -5501,7 +5493,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, // We don't care about the order of composing characters. // Get them into cchars[] first. while (len < clen) { - mc = mb_ptr2char(reginput + len); + mc = utf_ptr2char(reginput + len); cchars[ccount++] = mc; len += mb_char2len(mc); if (ccount == MAX_MCO) |