aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/syntax.c
diff options
context:
space:
mode:
authordundargoc <33953936+dundargoc@users.noreply.github.com>2023-01-09 14:13:06 +0100
committerGitHub <noreply@github.com>2023-01-09 21:13:06 +0800
commit149209400383c673fdb4fdd1c9a7639139f17936 (patch)
treed2c4e5fa69fc302ec3050978a303f6a479f30291 /src/nvim/syntax.c
parentfc2cd28547954e64ef429c83733f06fa3ee75d50 (diff)
downloadrneovim-149209400383c673fdb4fdd1c9a7639139f17936.tar.gz
rneovim-149209400383c673fdb4fdd1c9a7639139f17936.tar.bz2
rneovim-149209400383c673fdb4fdd1c9a7639139f17936.zip
refactor: replace char_u with char 17 - remove STRLCPY (#21235)
refactor: replace char_u with char Work on https://github.com/neovim/neovim/issues/459
Diffstat (limited to 'src/nvim/syntax.c')
-rw-r--r--src/nvim/syntax.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 0b92757fd9..8f0d8d2041 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -2742,20 +2742,20 @@ static int check_keyword_id(char *const line, const int startcol, int *const end
// Must make a copy of the keyword, so we can add a NUL and make it
// lowercase.
- char_u keyword[MAXKEYWLEN + 1]; // assume max. keyword len is 80
- STRLCPY(keyword, kwp, kwlen + 1);
+ char keyword[MAXKEYWLEN + 1]; // assume max. keyword len is 80
+ xstrlcpy(keyword, kwp, (size_t)kwlen + 1);
keyentry_T *kp = NULL;
// matching case
if (syn_block->b_keywtab.ht_used != 0) {
- kp = match_keyword((char *)keyword, &syn_block->b_keywtab, cur_si);
+ kp = match_keyword(keyword, &syn_block->b_keywtab, cur_si);
}
// ignoring case
if (kp == NULL && syn_block->b_keywtab_ic.ht_used != 0) {
- str_foldcase((char_u *)kwp, kwlen, (char *)keyword, MAXKEYWLEN + 1);
- kp = match_keyword((char *)keyword, &syn_block->b_keywtab_ic, cur_si);
+ str_foldcase((char_u *)kwp, kwlen, keyword, MAXKEYWLEN + 1);
+ kp = match_keyword(keyword, &syn_block->b_keywtab_ic, cur_si);
}
if (kp != NULL) {
@@ -4989,7 +4989,7 @@ static int get_id_list(char **const arg, const int keylen, int16_t **const list,
do {
for (end = p; *end && !ascii_iswhite(*end) && *end != ','; end++) {}
char *const name = xmalloc((size_t)(end - p) + 3); // leave room for "^$"
- STRLCPY(name + 1, p, end - p + 1);
+ xstrlcpy(name + 1, p, (size_t)(end - p) + 1);
if (strcmp(name + 1, "ALLBUT") == 0
|| strcmp(name + 1, "ALL") == 0
|| strcmp(name + 1, "TOP") == 0