kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26233 from bfredl/strictchar

Browse Source 
refactor(encoding): remove redundant vim_isprintc_strict
This commit is contained in:
bfredl 2023-11-26 22:41:40 +01:00 committed by GitHub
commit 3514b26a5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/charset.c
View File

@ -534,7 +534,7 @@ char *transchar_buf(const buf_T *buf, int c)
}
if ((!chartab_initialized && (c >= ' ' && c <= '~'))
|| ((c <= 0xFF) && vim_isprintc_strict(c))) {
|| ((c <= 0xFF) && vim_isprintc(c))) {
// printable character
transchar_charbuf[i] = (uint8_t)c;
transchar_charbuf[i + 1] = NUL;
@ -870,7 +870,6 @@ bool vim_isfilec_or_wc(int c)
}
/// Check that "c" is a printable character.
/// Assume characters above 0x100 are printable for double-byte encodings.
///
/// @param c character to check
bool vim_isprintc(int c)
@ -882,21 +881,6 @@ bool vim_isprintc(int c)
return c > 0 && (g_chartab[c] & CT_PRINT_CHAR);
}
/// Strict version of vim_isprintc(c), don't return true if "c" is the head
/// byte of a double-byte character.
///
/// @param c character to check
///
/// @return true if "c" is a printable character.
bool vim_isprintc_strict(int c)
FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
{
if (c >= 0x100) {
return utf_printable(c);
}
return c > 0 && (g_chartab[c] & CT_PRINT_CHAR);
}
/// skipwhite: skip over ' ' and '\t'.
///
/// @param[in] p String to skip in.

2
src/nvim/ex_cmds.c
View File

@ -155,7 +155,7 @@ void do_ascii(exarg_T *eap)
? NL // NL is stored as CR.
: c);
char buf1[20];
if (vim_isprintc_strict(c) && (c < ' ' || c > '~')) {
if (vim_isprintc(c) && (c < ' ' || c > '~')) {
char buf3[7];
transchar_nonprint(curbuf, buf3, c);
vim_snprintf(buf1, sizeof(buf1), " <%s>", buf3);

2
src/nvim/syntax.c
View File

@ -3881,7 +3881,7 @@ static char *get_syn_options(char *arg, syn_opt_arg_T *opt, int *conceal_char, i
// cchar=?
*conceal_char = utf_ptr2char(arg + 6);
arg += utfc_ptr2len(arg + 6) - 1;
if (!vim_isprintc_strict(*conceal_char)) {
if (!vim_isprintc(*conceal_char)) {
emsg(_(e_invalid_cchar_value));
return NULL;
}