diff options
| -rw-r--r-- | src/nvim/eval.c | 3 | ||||
| -rw-r--r-- | src/nvim/ops.c | 13 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 3be3dd84d4..815df19476 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -9559,8 +9559,7 @@ static void f_getreg(typval_T *argvars, typval_T *rettv) if (return_list) { rettv->v_type = VAR_LIST; rettv->vval.v_list = - (list_T *)get_reg_contents(regname, - (arg2 ? kGRegExprSrc : 0) | kGRegList); + get_reg_contents(regname, (arg2 ? kGRegExprSrc : 0) | kGRegList); } else { rettv->v_type = VAR_STRING; rettv->vval.v_string = get_reg_contents(regname, arg2 ? kGRegExprSrc : 0); diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 04a8a0017d..82036b1fec 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -4656,7 +4656,9 @@ char_u get_reg_type(int regname, long *reglen) /// When `flags` has `kGRegList` return a list with text `s`. /// Otherwise just return `s`. -static char_u *get_reg_wrap_one_line(char_u *s, int flags) +/// +/// Returns a void * for use in get_reg_contents(). +static void *get_reg_wrap_one_line(char_u *s, int flags) { if (!(flags & kGRegList)) { return s; @@ -4664,7 +4666,7 @@ static char_u *get_reg_wrap_one_line(char_u *s, int flags) list_T *list = list_alloc(); list_append_string(list, NULL, -1); list->lv_first->li_tv.vval.v_string = s; - return (char_u *)list; + return list; } /// Gets the contents of a register. @@ -4674,10 +4676,9 @@ static char_u *get_reg_wrap_one_line(char_u *s, int flags) /// @param flags see @ref GRegFlags /// /// @returns The contents of the register as an allocated string. -/// @returns A linked list cast to a string when given @ref kGRegList. +/// @returns A linked list when `flags` contains @ref kGRegList. /// @returns NULL for error. -// TODO(SplinterOfChaos): Maybe this should return a void*. -char_u *get_reg_contents(int regname, int flags) +void *get_reg_contents(int regname, int flags) { long i; @@ -4722,7 +4723,7 @@ char_u *get_reg_contents(int regname, int flags) list_append_string(list, y_current->y_array[i], -1); } - return (char_u *) list; + return list; } /* |