patch 9.1.0649: Wrong comment for "len" argument of call_simple_func()
Commit: https://github.com/vim/vim/commit/c1ed788c1b41db9b5f1ef548dc877f771f535bbe Author: zeertzjq <zeert...@outlook.com> Date: Thu Aug 1 22:46:54 2024 +0200 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: #15410 Signed-off-by: zeertzjq <zeert...@outlook.com> Signed-off-by: Christian Brabandt <c...@256bit.org> diff --git a/src/eval.c b/src/eval.c index 4f5646377..cc289b453 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3259,7 +3259,7 @@ may_call_simple_func( char_u *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/proto/userfunc.pro b/src/proto/userfunc.pro index ce5d257ca..32dac661b 100644 --- a/src/proto/userfunc.pro +++ b/src/proto/userfunc.pro @@ -39,7 +39,7 @@ int call_callback(callback_T *callback, int len, typval_T *rettv, int argcount, varnumber_T call_callback_retnr(callback_T *callback, int argcount, typval_T *argvars); void user_func_error(funcerror_T error, char_u *name, int found_var); int call_func(char_u *funcname, int len, typval_T *rettv, int argcount_in, typval_T *argvars_in, funcexe_T *funcexe); -int call_simple_func(char_u *funcname, int len, typval_T *rettv); +int call_simple_func(char_u *funcname, size_t len, typval_T *rettv); char_u *printable_func_name(ufunc_T *fp); char_u *trans_function_name(char_u **pp, int *is_global, int skip, int flags); char_u *trans_function_name_ext(char_u **pp, int *is_global, int skip, int flags, funcdict_T *fdp, partial_T **partial, type_T **type, ufunc_T **ufunc); diff --git a/src/userfunc.c b/src/userfunc.c index 1c58b01c7..9a8239401 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -4058,7 +4058,7 @@ theend: int call_simple_func( char_u *funcname, // name of the function - int len, // length of "name" or -1 to use strlen() + size_t len, // length of "name" typval_T *rettv) // return value goes here { int ret = FAIL; diff --git a/src/version.c b/src/version.c index 3ca600126..76b00a989 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 649, /**/ 648, /**/ -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/E1sZcu3-008l4y-D2%40256bit.org.
