mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-16 23:06:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0824: too many strlen() calls in register.c (#31022)

Browse Source 
Problem:  too many strlen() calls in register.c
Solution: refactor code, add string_T struct to keep track
          of string lengths (John Marriott)

closes: vim/vim#15952

79f6ffd388

Co-authored-by: John Marriott <basilisk@internode.on.net>
This commit is contained in:
zeertzjq
2024-11-01 17:34:19 +08:00
committed by GitHub
parent 9b357e30fd
commit cbd8b2c162
6 changed files with 152 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/shada.c
View File

@@ -246,7 +246,7 @@ typedef struct {
struct reg { // yankreg_T
char name;
MotionType type;
char **contents;
String *contents;
bool is_unnamed;
size_t contents_size;
size_t width;
@@ -1491,7 +1491,7 @@ static ShaDaWriteResult shada_pack_entry(PackerBuffer *const packer, ShadaEntry
PACK_KEY(REG_KEY_CONTENTS);
mpack_array(&sbuf.ptr, (uint32_t)entry.data.reg.contents_size);
for (size_t i = 0; i < entry.data.reg.contents_size; i++) {
mpack_bin(cstr_as_string(entry.data.reg.contents[i]), &sbuf);
mpack_bin(entry.data.reg.contents[i], &sbuf);
}
PACK_KEY(KEY_NAME_CHAR);
mpack_uint(&sbuf.ptr, (uint8_t)entry.data.reg.name);
@@ -2930,7 +2930,7 @@ static void shada_free_shada_entry(ShadaEntry *const entry)
break;
case kSDItemRegister:
for (size_t i = 0; i < entry->data.reg.contents_size; i++) {
xfree(entry->data.reg.contents[i]);
api_free_string(entry->data.reg.contents[i]);
}
xfree(entry->data.reg.contents);
break;
@@ -3312,9 +3312,9 @@ shada_read_next_item_start:
goto shada_read_next_item_error;
}
entry->data.reg.contents_size = it.rc.size;
entry->data.reg.contents = xmalloc(it.rc.size * sizeof(char *));
entry->data.reg.contents = xmalloc(it.rc.size * sizeof(String));
for (size_t j = 0; j < it.rc.size; j++) {
entry->data.reg.contents[j] = xmemdupz(it.rc.items[j].data, it.rc.items[j].size);
entry->data.reg.contents[j] = copy_string(it.rc.items[j], NULL);
}
kv_destroy(it.rc);