commit 6d722f33098da447ac29496b71dd58f2ae337996
parent 582bf4f1e15988565da53a91395e2d0131628fbb
Author: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 2 Aug 2024 11:49:00 +0800
vim-patch:9.1.0649: Wrong comment for "len" argument of call_simple_func()
Problem: Wrong comment for "len" argument of call_simple_func().
Solution: Remove the "or -1 to use strlen()". Also change its type to
size_t to remove one cast. (zeertzjq)
closes: vim/vim#15410
https://github.com/vim/vim/commit/c1ed788c1b41db9b5f1ef548dc877f771f535bbe
Diffstat:
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
@@ -2630,7 +2630,7 @@ static int may_call_simple_func(char *arg, typval_T *rettv)
if (parens != NULL && *skipwhite(parens + 2) == NUL) {
char *p = strncmp(arg, "<SNR>", 5) == 0 ? skipdigits(arg + 5) : arg;
if (to_name_end(p, true) == parens) {
- r = call_simple_func(arg, (int)(parens - arg), rettv);
+ r = call_simple_func(arg, (size_t)(parens - arg), rettv);
}
}
return r;
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
@@ -1782,9 +1782,9 @@ theend:
/// Returns NOTDONE when the function could not be found.
///
/// @param funcname name of the function
-/// @param len length of "name" or -1 to use strlen()
+/// @param len length of "name"
/// @param rettv return value goes here
-int call_simple_func(const char *funcname, int len, typval_T *rettv)
+int call_simple_func(const char *funcname, size_t len, typval_T *rettv)
FUNC_ATTR_NONNULL_ALL
{
int ret = FAIL;
@@ -1793,7 +1793,7 @@ int call_simple_func(const char *funcname, int len, typval_T *rettv)
rettv->vval.v_number = 0;
// Make a copy of the name, an option can be changed in the function.
- char *name = xstrnsave(funcname, (size_t)len);
+ char *name = xstrnsave(funcname, len);
int error = FCERR_NONE;
char *tofree = NULL;