IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

perf(highlight): get rid of local memory allocations for "{key}={arg}"

Browse Source
This commit is contained in:
bfredl 2022-06-21 10:49:06 +02:00
parent f479dd0bbe
commit 5ad97fcc0e
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/nvim/highlight_group.c
View File

@ -942,8 +942,8 @@ void do_highlight(const char *line, const bool forceit, const bool init)
} }
} }
char *key = NULL; char key[64];
char *arg = NULL; char arg[512];
if (!doclear) { if (!doclear) {
while (!ends_excmd((uint8_t)(*linep))) { while (!ends_excmd((uint8_t)(*linep))) {
key_start = linep; key_start = linep;
@ -958,9 +958,15 @@ void do_highlight(const char *line, const bool forceit, const bool init)
while (*linep && !ascii_iswhite(*linep) && *linep != '=') { while (*linep && !ascii_iswhite(*linep) && *linep != '=') {
linep++; linep++;
} }
xfree(key); size_t key_len = (size_t)(linep - key_start);
key = (char *)vim_strnsave_up((const char_u *)key_start, if (key_len > sizeof key - 1) {
(size_t)(linep - key_start)); semsg(_("E423: Illegal argument"));
error = true;
break;
}
memcpy(key, key_start, key_len);
key[key_len] = NUL;
vim_strup((char_u *)key);
linep = (const char *)skipwhite(linep); linep = (const char *)skipwhite(linep);
if (strcmp(key, "NONE") == 0) { if (strcmp(key, "NONE") == 0) {
@ -1000,8 +1006,14 @@ void do_highlight(const char *line, const bool forceit, const bool init)
error = true; error = true;
break; break;
} }
xfree(arg); size_t arg_len = (size_t)(linep - arg_start);
arg = xstrndup(arg_start, (size_t)(linep - arg_start)); if (arg_len > sizeof arg - 1) {
semsg(_("E423: Illegal argument"));
error = true;
break;
}
memcpy(arg, arg_start, arg_len);
arg[arg_len] = NUL;
if (*linep == '\'') { if (*linep == '\'') {
linep++; linep++;
@ -1271,8 +1283,6 @@ void do_highlight(const char *line, const bool forceit, const bool init)
HL_TABLE()[idx].sg_script_ctx.sc_lnum += sourcing_lnum; HL_TABLE()[idx].sg_script_ctx.sc_lnum += sourcing_lnum;
nlua_set_sctx(&HL_TABLE()[idx].sg_script_ctx); nlua_set_sctx(&HL_TABLE()[idx].sg_script_ctx);
} }
xfree(key);
xfree(arg);
// Only call highlight_changed() once, after a sequence of highlight // Only call highlight_changed() once, after a sequence of highlight
// commands, and only if an attribute actually changed // commands, and only if an attribute actually changed