mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-11 05:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Remove occurences of mb_char2bytes

Browse Source
This commit is contained in:
ZviRackover
2018-09-02 00:58:30 +03:00
parent 50eadfe2e9
commit cbdbc4f63d
17 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/arabic.c
View File

@@ -761,7 +761,7 @@ int arabic_shape(int c, int *ccp, int *c1p, int prev_c, int prev_c1,
char_u buf[MB_MAXBYTES + 1];
// Update the first byte of the character
(*mb_char2bytes)(curr_c, buf);
utf_char2bytes(curr_c, buf);
*ccp = buf[0];
}

2
src/nvim/digraph.c
View File

@@ -1708,7 +1708,7 @@ static void printdigraph(digr_T *dp)
if (utf_iscomposing(dp->result)) {
*p++ = ' ';
}
p += (*mb_char2bytes)(dp->result, p);
p += utf_char2bytes(dp->result, p);
*p = NUL;
msg_outtrans_attr(buf, HL_ATTR(HLF_8));

8
src/nvim/edit.c
View File

@@ -2132,7 +2132,7 @@ int ins_compl_add_infercase(char_u *str, int len, int icase, char_u *fname, int
i = 0;
while (i < actual_len && (p - IObuff + 6) < IOSIZE) {
if (has_mbyte) {
p += (*mb_char2bytes)(wca[i++], p);
p += utf_char2bytes(wca[i++], p);
} else {
*(p++) = wca[i++];
}
@@ -3087,7 +3087,7 @@ static void ins_compl_addleader(int c)
if (has_mbyte && (cc = (*mb_char2len)(c)) > 1) {
char_u buf[MB_MAXBYTES + 1];
(*mb_char2bytes)(c, buf);
utf_char2bytes(c, buf);
buf[cc] = NUL;
ins_char_bytes(buf, cc);
} else {
@@ -5337,7 +5337,7 @@ insertchar (
if (has_mbyte && (cc = (*mb_char2len)(c)) > 1) {
char_u buf[MB_MAXBYTES + 1];
(*mb_char2bytes)(c, buf);
utf_char2bytes(c, buf);
buf[cc] = NUL;
ins_char_bytes(buf, cc);
AppendCharToRedobuff(c);
@@ -8661,7 +8661,7 @@ static char_u *do_insert_char_pre(int c)
return NULL;
}
if (has_mbyte) {
buf[(*mb_char2bytes)(c, (char_u *) buf)] = NUL;
buf[utf_char2bytes(c, (char_u *) buf)] = NUL;
} else {
buf[0] = c;
buf[1] = NUL;

8
src/nvim/eval.c
View File

@@ -4719,7 +4719,7 @@ static int get_string_tv(char_u **arg, typval_T *rettv, int evaluate)
/* For "\u" store the number according to
* 'encoding'. */
if (c != 'X')
name += (*mb_char2bytes)(nr, name);
name += utf_char2bytes(nr, name);
else
*name++ = nr;
}
@@ -9478,7 +9478,7 @@ static void f_getchar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
temp[i++] = K_SECOND(n);
temp[i++] = K_THIRD(n);
} else if (has_mbyte)
i += (*mb_char2bytes)(n, temp + i);
i += utf_char2bytes(n, temp + i);
else
temp[i++] = n;
temp[i++] = NUL;
@@ -10010,7 +10010,7 @@ static void f_getmatches(typval_T *argvars, typval_T *rettv, FunPtr fptr)
if (cur->conceal_char) {
char buf[MB_MAXBYTES + 1];
buf[(*mb_char2bytes)((int)cur->conceal_char, (char_u *)buf)] = NUL;
buf[utf_char2bytes((int)cur->conceal_char, (char_u *)buf)] = NUL;
tv_dict_add_str(dict, S_LEN("conceal"), buf);
}
@@ -18347,7 +18347,7 @@ void set_vim_var_char(int c)
char buf[MB_MAXBYTES + 1];
if (has_mbyte) {
buf[(*mb_char2bytes)(c, (char_u *) buf)] = NUL;
buf[utf_char2bytes(c, (char_u *) buf)] = NUL;
} else {
buf[0] = c;
buf[1] = NUL;

10
src/nvim/ex_getln.c
View File

@@ -1763,7 +1763,7 @@ static int command_line_handle_key(CommandLineState *s)
put_on_cmdline(get_special_key_name(s->c, mod_mask), -1, true);
} else {
if (has_mbyte) {
s->j = (*mb_char2bytes)(s->c, IObuff);
s->j = utf_char2bytes(s->c, IObuff);
IObuff[s->j] = NUL; // exclude composing chars
put_on_cmdline(IObuff, s->j, true);
} else {
@@ -2373,7 +2373,7 @@ redraw:
c1 = '?';
}
if (has_mbyte) {
len = (*mb_char2bytes)(c1, (char_u *)line_ga.ga_data + line_ga.ga_len);
len = utf_char2bytes(c1, (char_u *)line_ga.ga_data + line_ga.ga_len);
} else {
len = 1;
((char_u *)line_ga.ga_data)[line_ga.ga_len] = c1;
@@ -2897,11 +2897,11 @@ static void draw_cmdline(int start, int len)
u8c = arabic_shape(u8c, NULL, &u8cc[0], pc, pc1, nc);
newlen += (*mb_char2bytes)(u8c, arshape_buf + newlen);
newlen += utf_char2bytes(u8c, arshape_buf + newlen);
if (u8cc[0] != 0) {
newlen += (*mb_char2bytes)(u8cc[0], arshape_buf + newlen);
newlen += utf_char2bytes(u8cc[0], arshape_buf + newlen);
if (u8cc[1] != 0)
newlen += (*mb_char2bytes)(u8cc[1],
newlen += utf_char2bytes(u8cc[1],
arshape_buf + newlen);
}
} else {

6
src/nvim/getchar.c
View File

@@ -315,7 +315,7 @@ static void add_char_buff(buffheader_T *buf, int c)
if (IS_SPECIAL(c)) {
len = 1;
} else {
len = mb_char2bytes(c, bytes);
len = utf_char2bytes(c, bytes);
}
for (int i = 0; i < len; i++) {
@@ -978,7 +978,7 @@ void ins_char_typebuf(int c)
buf[2] = (char_u)K_THIRD(c);
buf[3] = NUL;
} else {
buf[(*mb_char2bytes)(c, buf)] = NUL;
buf[utf_char2bytes(c, buf)] = NUL;
}
(void)ins_typebuf(buf, KeyNoremap, 0, !KeyTyped, cmd_silent);
}
@@ -3661,7 +3661,7 @@ int check_abbr(int c, char_u *ptr, int col, int mincol)
/* if ABBR_OFF has been added, remove it here */
if (c >= ABBR_OFF)
c -= ABBR_OFF;
j += (*mb_char2bytes)(c, tb + j);
j += utf_char2bytes(c, tb + j);
} else {
tb[j++] = (char_u)c;
}

4
src/nvim/keymap.c
View File

@@ -466,7 +466,7 @@ char_u *get_special_key_name(int c, int modifiers)
/* Not a special key, only modifiers, output directly */
else {
if (has_mbyte && (*mb_char2len)(c) > 1)
idx += (*mb_char2bytes)(c, string + idx);
idx += utf_char2bytes(c, string + idx);
else if (vim_isprintc(c))
string[idx++] = (char_u)c;
else {
@@ -525,7 +525,7 @@ unsigned int trans_special(const char_u **srcp, const size_t src_len,
dst[dlen++] = (char_u)KEY2TERMCAP0(key);
dst[dlen++] = KEY2TERMCAP1(key);
} else if (has_mbyte && !keycode) {
dlen += (unsigned int)(*mb_char2bytes)(key, dst + dlen);
dlen += (unsigned int)utf_char2bytes(key, dst + dlen);
} else if (keycode) {
char_u *after = add_char2buf(key, dst + dlen);
assert(after >= dst && (uintmax_t)(after - dst) <= UINT_MAX);

1
src/nvim/mbyte.h
View File

@@ -48,7 +48,6 @@ enum { MAX_MCO = 6 };
// TODO(bfredl): eventually we should keep only one of the namings
#define mb_ptr2len utfc_ptr2len
#define mb_char2len utf_char2len
#define mb_char2bytes utf_char2bytes
#define mb_char2cells utf_char2cells
/// Flags for vimconv_T

2
src/nvim/message.c
View File

@@ -1121,7 +1121,7 @@ void msg_putchar_attr(int c, int attr)
buf[2] = (char)K_THIRD(c);
buf[3] = NUL;
} else {
buf[(*mb_char2bytes)(c, (char_u *)buf)] = NUL;
buf[utf_char2bytes(c, (char_u *)buf)] = NUL;
}
msg_puts_attr(buf, attr);
}

2
src/nvim/misc1.c
View File

@@ -1398,7 +1398,7 @@ void ins_bytes_len(char_u *p, size_t len)
void ins_char(int c)
{
char_u buf[MB_MAXBYTES + 1];
size_t n = (size_t)(*mb_char2bytes)(c, buf);
size_t n = (size_t)utf_char2bytes(c, buf);
// When "c" is 0x100, 0x200, etc. we don't want to insert a NUL byte.
// Happens for CTRL-Vu9900.

2
src/nvim/ops.c
View File

@@ -1739,7 +1739,7 @@ int op_replace(oparg_T *oap, int c)
int newp_len = bd.textcol + bd.startspaces;
if (has_mbyte) {
while (--num_chars >= 0) {
newp_len += (*mb_char2bytes)(c, newp + newp_len);
newp_len += utf_char2bytes(c, newp + newp_len);
}
} else {
memset(newp + newp_len, c, (size_t)numc);

6
src/nvim/regexp.c
View File

@@ -2543,7 +2543,7 @@ static void regmbc(int c)
if (regcode == JUST_CALC_SIZE)
regsize += (*mb_char2len)(c);
else
regcode += (*mb_char2bytes)(c, regcode);
regcode += utf_char2bytes(c, regcode);
}
/*
@@ -6763,7 +6763,7 @@ static int vim_regsub_both(char_u *source, typval_T *expr, char_u *dest,
int totlen = mb_ptr2len(src - 1);
if (copy)
mb_char2bytes(cc, dst);
utf_char2bytes(cc, dst);
dst += mb_char2len(cc) - 1;
if (enc_utf8) {
int clen = utf_ptr2len(src - 1);
@@ -6866,7 +6866,7 @@ static int vim_regsub_both(char_u *source, typval_T *expr, char_u *dest,
s += l;
len -= l;
if (copy)
mb_char2bytes(cc, dst);
utf_char2bytes(cc, dst);
dst += mb_char2len(cc) - 1;
} else if (copy)
*dst = cc;

2
src/nvim/regexp_nfa.c
View File

@@ -564,7 +564,7 @@ static char_u *nfa_get_match_text(nfa_state_T *start)
s = ret;
while (p->c > 0) {
if (has_mbyte)
s += (*mb_char2bytes)(p->c, s);
s += utf_char2bytes(p->c, s);
else
*s++ = p->c;
p = p->out;

8
src/nvim/screen.c
View File

@@ -3539,7 +3539,7 @@ win_line (
xfree(p_extra_free);
p_extra_free = p;
for (i = 0; i < tab_len; i++) {
mb_char2bytes(lcs_tab2, p);
utf_char2bytes(lcs_tab2, p);
p += mb_char2len(lcs_tab2);
n_extra += mb_char2len(lcs_tab2) - (saved_nextra > 0 ? 1: 0);
}
@@ -5120,7 +5120,7 @@ win_redr_custom (
/* fill up with "fillchar" */
while (width < maxwidth && len < (int)sizeof(buf) - 1) {
len += (*mb_char2bytes)(fillchar, buf + len);
len += utf_char2bytes(fillchar, buf + len);
++width;
}
buf[len] = NUL;
@@ -5229,7 +5229,7 @@ void screen_putchar(int c, int row, int col, int attr)
{
char_u buf[MB_MAXBYTES + 1];
buf[(*mb_char2bytes)(c, buf)] = NUL;
buf[utf_char2bytes(c, buf)] = NUL;
screen_puts(buf, row, col, attr);
}
@@ -6955,7 +6955,7 @@ static void win_redr_ruler(win_T *wp, int always)
// Need at least 3 chars left for get_rel_pos() + NUL.
while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) {
if (has_mbyte)
i += (*mb_char2bytes)(fillchar, buffer + i);
i += utf_char2bytes(fillchar, buffer + i);
else
buffer[i++] = fillchar;
++o;

6
src/nvim/search.c
View File

@@ -1376,11 +1376,11 @@ int searchc(cmdarg_T *cap, int t_cmd)
*lastc = c;
set_csearch_direction(dir);
set_csearch_until(t_cmd);
lastc_bytelen = (*mb_char2bytes)(c, lastc_bytes);
lastc_bytelen = utf_char2bytes(c, lastc_bytes);
if (cap->ncharC1 != 0) {
lastc_bytelen += (*mb_char2bytes)(cap->ncharC1, lastc_bytes + lastc_bytelen);
lastc_bytelen += utf_char2bytes(cap->ncharC1, lastc_bytes + lastc_bytelen);
if (cap->ncharC2 != 0)
lastc_bytelen += (*mb_char2bytes)(cap->ncharC2, lastc_bytes + lastc_bytelen);
lastc_bytelen += utf_char2bytes(cap->ncharC2, lastc_bytes + lastc_bytelen);
}
}
} else { // repeat previous search

32
src/nvim/spell.c
View File

@@ -2684,7 +2684,7 @@ int spell_casefold(char_u *str, int len, char_u *buf, int buflen)
return FAIL;
}
c = mb_cptr2char_adv((const char_u **)&p);
outi += mb_char2bytes(SPELL_TOFOLD(c), buf + outi);
outi += utf_char2bytes(SPELL_TOFOLD(c), buf + outi);
}
buf[outi] = NUL;
} else {
@@ -3434,7 +3434,7 @@ void onecap_copy(char_u *word, char_u *wcopy, bool upper)
c = SPELL_TOFOLD(c);
}
if (has_mbyte) {
l = mb_char2bytes(c, wcopy);
l = utf_char2bytes(c, wcopy);
} else {
l = 1;
wcopy[0] = c;
@@ -3469,7 +3469,7 @@ static void allcap_copy(char_u *word, char_u *wcopy)
if (has_mbyte) {
if (d - wcopy >= MAXWLEN - MB_MAXBYTES)
break;
d += mb_char2bytes(c, d);
d += utf_char2bytes(c, d);
} else {
if (d - wcopy >= MAXWLEN - 1)
break;
@@ -4546,7 +4546,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
if (has_mbyte) {
fl = mb_char2len(c2);
memmove(p, p + n, fl);
mb_char2bytes(c, p + fl);
utf_char2bytes(c, p + fl);
stack[depth].ts_fidxtry = sp->ts_fidx + n + fl;
} else {
p[0] = c2;
@@ -4565,7 +4565,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
n = MB_PTR2LEN(p);
c = utf_ptr2char(p + n);
memmove(p + MB_PTR2LEN(p + n), p, n);
mb_char2bytes(c, p);
utf_char2bytes(c, p);
// FALLTHROUGH
@@ -4607,8 +4607,8 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
if (has_mbyte) {
tl = mb_char2len(c3);
memmove(p, p + n + fl, tl);
mb_char2bytes(c2, p + tl);
mb_char2bytes(c, p + fl + tl);
utf_char2bytes(c2, p + tl);
utf_char2bytes(c, p + fl + tl);
stack[depth].ts_fidxtry = sp->ts_fidx + n + fl + tl;
} else {
p[0] = p[2];
@@ -4630,8 +4630,8 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
c = utf_ptr2char(p + n + fl);
tl = MB_PTR2LEN(p + n + fl);
memmove(p + fl + tl, p, n);
mb_char2bytes(c, p);
mb_char2bytes(c2, p + tl);
utf_char2bytes(c, p);
utf_char2bytes(c2, p + tl);
p = p + tl;
if (!soundfold && !spell_iswordp(p, curwin)) {
@@ -4677,7 +4677,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
c = utf_ptr2char(p + n);
tl = MB_PTR2LEN(p + n);
memmove(p + tl, p, n);
mb_char2bytes(c, p);
utf_char2bytes(c, p);
// Rotate three bytes right: "123" -> "312". We change "fword"
// here, it's changed back afterwards at STATE_UNROT3R.
@@ -4698,7 +4698,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
c = utf_ptr2char(p + n);
tl = MB_CPTR2LEN(p + n);
memmove(p + tl, p, n);
mb_char2bytes(c, p);
utf_char2bytes(c, p);
stack[depth].ts_fidxtry = sp->ts_fidx + n + tl;
} else {
PROF_STORE(sp->ts_state)
@@ -4714,7 +4714,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
n = MB_PTR2LEN(p + tl);
n += MB_PTR2LEN(p + tl + n);
memmove(p, p + tl, n);
mb_char2bytes(c, p + n);
utf_char2bytes(c, p + n);
// FALLTHROUGH
@@ -5539,7 +5539,7 @@ static bool similar_chars(slang_T *slang, int c1, int c2)
hashitem_T *hi;
if (c1 >= 256) {
buf[mb_char2bytes(c1, buf)] = 0;
buf[utf_char2bytes(c1, buf)] = 0;
hi = hash_find(&slang->sl_map_hash, buf);
if (HASHITEM_EMPTY(hi)) {
m1 = 0;
@@ -5554,7 +5554,7 @@ static bool similar_chars(slang_T *slang, int c1, int c2)
}
if (c2 >= 256) {
buf[mb_char2bytes(c2, buf)] = 0;
buf[utf_char2bytes(c2, buf)] = 0;
hi = hash_find(&slang->sl_map_hash, buf);
if (HASHITEM_EMPTY(hi)) {
m2 = 0;
@@ -5917,7 +5917,7 @@ static void spell_soundfold_sofo(slang_T *slang, char_u *inword, char_u *res)
}
if (c != NUL && c != prevc) {
ri += mb_char2bytes(c, res + ri);
ri += utf_char2bytes(c, res + ri);
if (ri + MB_MAXBYTES > MAXWLEN)
break;
prevc = c;
@@ -6440,7 +6440,7 @@ static void spell_soundfold_wsal(slang_T *slang, char_u *inword, char_u *res)
// Convert wide characters in "wres" to a multi-byte string in "res".
l = 0;
for (n = 0; n < reslen; ++n) {
l += mb_char2bytes(wres[n], res + l);
l += utf_char2bytes(wres[n], res + l);
if (l + MB_MAXBYTES > MAXWLEN)
break;
}

8
src/nvim/spellfile.c
View File

@@ -1460,7 +1460,7 @@ static int read_compound(FILE *fd, slang_T *slang, int len)
if (c == '?' || c == '+' || c == '~')
*pp++ = '\\'; // "a?" becomes "a\?", "a+" becomes "a\+"
if (enc_utf8)
pp += mb_char2bytes(c, pp);
pp += utf_char2bytes(c, pp);
else
*pp++ = c;
}
@@ -4246,7 +4246,7 @@ static int write_vim_spell(spellinfo_T *spin, char_u *fname)
size_t l = 0;
for (size_t i = 128; i < 256; ++i) {
if (has_mbyte)
l += (size_t)mb_char2bytes(spelltab.st_fold[i], folchars + l);
l += (size_t)utf_char2bytes(spelltab.st_fold[i], folchars + l);
else
folchars[l++] = spelltab.st_fold[i];
}
@@ -5710,9 +5710,9 @@ static void set_map_str(slang_T *lp, char_u *map)
hashitem_T *hi;
b = xmalloc(cl + headcl + 2);
mb_char2bytes(c, b);
utf_char2bytes(c, b);
b[cl] = NUL;
mb_char2bytes(headc, b + cl + 1);
utf_char2bytes(headc, b + cl + 1);
b[cl + 1 + headcl] = NUL;
hash = hash_hash(b);
hi = hash_lookup(&lp->sl_map_hash, (const char *)b, STRLEN(b), hash);