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

executor: Do not use S_LEN for memcpy

Browse Source 
Sometimes it is implemented as a macro and `S_LEN` is treated as a single 
argument in this case.
This commit is contained in:
ZyX 2017-01-29 20:20:41 +03:00
parent 09fe6185b7
commit 1801d44f53
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/viml/executor/executor.c
View File

@ -174,9 +174,9 @@ static int nlua_exec_luado_string(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
} else { } else {
lcmd = xmalloc(lcmd_len + 1); lcmd = xmalloc(lcmd_len + 1);
} }
memcpy(lcmd, S_LEN(DOSTART)); memcpy(lcmd, DOSTART, sizeof(DOSTART) - 1);
memcpy(lcmd + sizeof(DOSTART) - 1, str->data, str->size); memcpy(lcmd + sizeof(DOSTART) - 1, str->data, str->size);
memcpy(lcmd + sizeof(DOSTART) - 1 + str->size, S_LEN(DOEND)); memcpy(lcmd + sizeof(DOSTART) - 1 + str->size, DOEND, sizeof(DOEND) - 1);
#undef DOSTART #undef DOSTART
#undef DOEND #undef DOEND
@ -325,7 +325,7 @@ static int nlua_eval_lua_string(lua_State *const lstate)
} else { } else {
lcmd = xmalloc(lcmd_len); lcmd = xmalloc(lcmd_len);
} }
memcpy(lcmd, S_LEN(EVALHEADER)); memcpy(lcmd, EVALHEADER, sizeof(EVALHEADER) - 1);
memcpy(lcmd + sizeof(EVALHEADER) - 1, str->data, str->size); memcpy(lcmd + sizeof(EVALHEADER) - 1, str->data, str->size);
lcmd[lcmd_len - 1] = ')'; lcmd[lcmd_len - 1] = ')';
#undef EVALHEADER #undef EVALHEADER