diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-11 18:37:44 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-11 18:37:44 +0200 |
| commit | 6ed8819822994512c160006bd1204aa11ae3c494 (patch) | |
| tree | 171487d99e5cf0a6c7e5333159d98c821064e93e /src/channel.c | |
| parent | ec28d1516eb8bb5dcaa42de145953a6d49aebb6f (diff) | |
patch 8.1.1319: computing function length name in many placesv8.1.1319
Problem: Computing function length name in many places.
Solution: compute name length in call_func().
Diffstat (limited to 'src/channel.c')
| -rw-r--r-- | src/channel.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/channel.c b/src/channel.c index a29414f69f..31c9bbe229 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1650,7 +1650,7 @@ invoke_callback(channel_T *channel, char_u *callback, partial_T *partial, argv[0].v_type = VAR_CHANNEL; argv[0].vval.v_channel = channel; - call_func(callback, (int)STRLEN(callback), &rettv, 2, argv, NULL, + call_func(callback, -1, &rettv, 2, argv, NULL, 0L, 0L, &dummy, TRUE, partial, NULL); clear_tv(&rettv); channel_need_redraw = TRUE; @@ -2989,7 +2989,7 @@ channel_close(channel_T *channel, int invoke_close_cb) (char *)channel->ch_close_cb); argv[0].v_type = VAR_CHANNEL; argv[0].vval.v_channel = channel; - call_func(channel->ch_close_cb, (int)STRLEN(channel->ch_close_cb), + call_func(channel->ch_close_cb, -1, &rettv, 1, argv, NULL, 0L, 0L, &dummy, TRUE, channel->ch_close_partial, NULL); clear_tv(&rettv); @@ -5478,7 +5478,7 @@ job_cleanup(job_T *job) argv[0].vval.v_job = job; argv[1].v_type = VAR_NUMBER; argv[1].vval.v_number = job->jv_exitval; - call_func(job->jv_exit_cb, (int)STRLEN(job->jv_exit_cb), + call_func(job->jv_exit_cb, -1, &rettv, 2, argv, NULL, 0L, 0L, &dummy, TRUE, job->jv_exit_partial, NULL); clear_tv(&rettv); @@ -6069,8 +6069,7 @@ invoke_prompt_callback(void) argv[0].vval.v_string = vim_strsave(text); argv[1].v_type = VAR_UNKNOWN; - call_func(curbuf->b_prompt_callback, - (int)STRLEN(curbuf->b_prompt_callback), + call_func(curbuf->b_prompt_callback, -1, &rettv, 1, argv, NULL, 0L, 0L, &dummy, TRUE, curbuf->b_prompt_partial, NULL); clear_tv(&argv[0]); @@ -6093,8 +6092,7 @@ invoke_prompt_interrupt(void) argv[0].v_type = VAR_UNKNOWN; got_int = FALSE; // don't skip executing commands - call_func(curbuf->b_prompt_interrupt, - (int)STRLEN(curbuf->b_prompt_interrupt), + call_func(curbuf->b_prompt_interrupt, -1, &rettv, 0, argv, NULL, 0L, 0L, &dummy, TRUE, curbuf->b_prompt_int_partial, NULL); clear_tv(&rettv); |