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

Return void * from get_reg_contents.

Browse Source
This commit is contained in:
Scott Prager 2014-09-02 23:18:15 -04:00
parent e18538f3ef
commit 2f8cc3b9d5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/eval.c
View File

@ -9559,8 +9559,7 @@ static void f_getreg(typval_T *argvars, typval_T *rettv)
if (return_list) { if (return_list) {
rettv->v_type = VAR_LIST; rettv->v_type = VAR_LIST;
rettv->vval.v_list = rettv->vval.v_list =
(list_T *)get_reg_contents(regname, get_reg_contents(regname, (arg2 ? kGRegExprSrc : 0) | kGRegList);
(arg2 ? kGRegExprSrc : 0) | kGRegList);
} else { } else {
rettv->v_type = VAR_STRING; rettv->v_type = VAR_STRING;
rettv->vval.v_string = get_reg_contents(regname, arg2 ? kGRegExprSrc : 0); rettv->vval.v_string = get_reg_contents(regname, arg2 ? kGRegExprSrc : 0);

13
src/nvim/ops.c
View File

@ -4656,7 +4656,9 @@ char_u get_reg_type(int regname, long *reglen)
/// When `flags` has `kGRegList` return a list with text `s`. /// When `flags` has `kGRegList` return a list with text `s`.
/// Otherwise just return `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)) { if (!(flags & kGRegList)) {
return s; 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_T *list = list_alloc();
list_append_string(list, NULL, -1); list_append_string(list, NULL, -1);
list->lv_first->li_tv.vval.v_string = s; list->lv_first->li_tv.vval.v_string = s;
return (char_u *)list; return list;
} }
/// Gets the contents of a register. /// 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 /// @param flags see @ref GRegFlags
/// ///
/// @returns The contents of the register as an allocated string. /// @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. /// @returns NULL for error.
// TODO(SplinterOfChaos): Maybe this should return a void*. void *get_reg_contents(int regname, int flags)
char_u *get_reg_contents(int regname, int flags)
{ {
long i; 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); list_append_string(list, y_current->y_array[i], -1);
} }
return (char_u *) list; return list;
} }
/* /*