aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.1.1169: using global variable for get_insert()/get_lambda_name()

Browse Source 
Problem:  using global variable for get_insert()/get_lambda_name()
          (after v9.1.1151)
Solution: let the functions return a string_T object instead
          (Yee Cheng Chin)

In #16720, `get_insert()` was modified to store a string length in a
global variable to be queried immediately by another `get_insert_len()`
function, which is somewhat fragile. Instead, just have the function
itself return a `string_T` object instead. Also do the same for
`get_lambda_name()` which has similar issues.

closes: #16775

Signed-off-by: Yee Cheng Chin <ychin.git@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yee Cheng Chin
2025-03-03 20:12:05 +01:00
committed by Christian Brabandt
parent d2219d547d
commit 0b5fe42071
7 changed files with 40 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/userfunc.c
View File

@@ -683,36 +683,28 @@ make_ufunc_name_readable(char_u *name, char_u *buf, size_t bufsize)
}
static char_u lambda_name[8 + NUMBUFLEN];
static size_t lambda_namelen = 0;
/*
* Get a name for a lambda. Returned in static memory.
*/
char_u *
string_T
get_lambda_name(void)
{
static int lambda_no = 0;
int n;
string_T ret;
n = vim_snprintf((char *)lambda_name, sizeof(lambda_name), "<lambda>%d", ++lambda_no);
if (n < 1)
lambda_namelen = 0;
ret.length = 0;
else
if (n >= (int)sizeof(lambda_name))
lambda_namelen = sizeof(lambda_name) - 1;
ret.length = sizeof(lambda_name) - 1;
else
lambda_namelen = (size_t)n;
ret.length = (size_t)n;
return lambda_name;
}
/*
* Get the length of the last lambda name.
*/
size_t
get_lambda_name_len(void)
{
return lambda_namelen;
ret.string = lambda_name;
return ret;
}
/*
@@ -756,11 +748,10 @@ alloc_ufunc(char_u *name, size_t namelen)
char_u *
register_cfunc(cfunc_T cb, cfunc_free_T cb_free, void *state)
{
char_u *name = get_lambda_name();
size_t namelen = get_lambda_name_len();
string_T name = get_lambda_name();
ufunc_T *fp;
fp = alloc_ufunc(name, namelen);
fp = alloc_ufunc(name.string, name.length);
if (fp == NULL)
return NULL;
@@ -776,7 +767,7 @@ register_cfunc(cfunc_T cb, cfunc_free_T cb_free, void *state)
hash_add(&func_hashtab, UF2HIKEY(fp), "add C function");
return name;
return name.string;
}
#endif
@@ -1477,8 +1468,7 @@ lambda_function_body(
char_u *cmdline = NULL;
int ret = FAIL;
partial_T *pt;
char_u *name;
size_t namelen;
string_T name;
int lnum_save = -1;
linenr_T sourcing_lnum_top = SOURCING_LNUM;
char_u *line_arg = NULL;
@@ -1597,8 +1587,7 @@ lambda_function_body(
}
name = get_lambda_name();
namelen = get_lambda_name_len();
ufunc = alloc_ufunc(name, namelen);
ufunc = alloc_ufunc(name.string, name.length);
if (ufunc == NULL)
goto erret;
if (hash_add(&func_hashtab, UF2HIKEY(ufunc), "add function") == FAIL)
@@ -1805,10 +1794,9 @@ get_lambda_tv(
int flags = FC_LAMBDA;
char_u *p;
char_u *line_end;
char_u *name = get_lambda_name();
size_t namelen = get_lambda_name_len();
string_T name = get_lambda_name();
fp = alloc_ufunc(name, namelen);
fp = alloc_ufunc(name.string, name.length);
if (fp == NULL)
goto errret;
fp->uf_def_status = UF_NOT_COMPILED;