aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/mbyte.c
diff options
context:
space:
mode:
authorZviRackover <zvirack@gmail.com>2018-08-29 21:15:32 +0300
committerZviRackover <zvirack@gmail.com>2018-08-31 22:45:10 +0300
commit1c03a064870af18f50d4f11cf4c7532c5cfae495 (patch)
treee9d2c6c5509ad8ae700b5a71cc920c2abd0c3833 /src/nvim/mbyte.c
parente30ccd56d9543afd5e66feec984a9dc8bc6be38e (diff)
downloadrneovim-1c03a064870af18f50d4f11cf4c7532c5cfae495.tar.gz
rneovim-1c03a064870af18f50d4f11cf4c7532c5cfae495.tar.bz2
rneovim-1c03a064870af18f50d4f11cf4c7532c5cfae495.zip
Refactor: remove mb_ptr2len_len, mb_ptr2cells and mb_ptr2cells_len
Remove occurences of these macros.
Diffstat (limited to 'src/nvim/mbyte.c')
-rw-r--r--src/nvim/mbyte.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index 11c1897153..0bc97e1686 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -550,7 +550,7 @@ size_t mb_string2cells(const char_u *str)
size_t clen = 0;
for (const char_u *p = str; *p != NUL; p += (*mb_ptr2len)(p)) {
- clen += (*mb_ptr2cells)(p);
+ clen += utf_ptr2cells(p);
}
return clen;
@@ -2124,7 +2124,7 @@ static char_u *iconv_string(const vimconv_T *const vcp, char_u *str,
* conversion from 'encoding' to something else. In other
* situations we don't know what to skip anyway. */
*to++ = '?';
- if ((*mb_ptr2cells)((char_u *)from) > 1)
+ if (utf_ptr2cells((char_u *)from) > 1)
*to++ = '?';
l = utfc_ptr2len_len((const char_u *)from, (int)fromlen);
from += l;