Mercurial > vim

comparison src/channel.c @ 16634:a1ba0bd74e7d v8.1.1319

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1319: computing function length name in many places commit https://github.com/vim/vim/commit/6ed8819822994512c160006bd1204aa11ae3c494 Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 11 18:37:44 2019 +0200 patch 8.1.1319: computing function length name in many places Problem: Computing function length name in many places. Solution: compute name length in call_func().
author Bram Moolenaar <Bram@vim.org>
date Sat, 11 May 2019 18:45:07 +0200
parents 8f0ea605ec96
children ef00b6bc186b
comparison
equal deleted inserted replaced
16633:d7c2a68c6400 16634:a1ba0bd74e7d
1648 iemsg("INTERNAL: Invoking callback when it is not safe"); 1648 iemsg("INTERNAL: Invoking callback when it is not safe");
1649 1649
1650 argv[0].v_type = VAR_CHANNEL; 1650 argv[0].v_type = VAR_CHANNEL;
1651 argv[0].vval.v_channel = channel; 1651 argv[0].vval.v_channel = channel;
1652 1652
1653 call_func(callback, (int)STRLEN(callback), &rettv, 2, argv, NULL, 1653 call_func(callback, -1, &rettv, 2, argv, NULL,
1654 0L, 0L, &dummy, TRUE, partial, NULL); 1654 0L, 0L, &dummy, TRUE, partial, NULL);
1655 clear_tv(&rettv); 1655 clear_tv(&rettv);
1656 channel_need_redraw = TRUE; 1656 channel_need_redraw = TRUE;
1657 } 1657 }
1658 1658
2987 ++channel->ch_refcount; 2987 ++channel->ch_refcount;
2988 ch_log(channel, "Invoking close callback %s", 2988 ch_log(channel, "Invoking close callback %s",
2989 (char *)channel->ch_close_cb); 2989 (char *)channel->ch_close_cb);
2990 argv[0].v_type = VAR_CHANNEL; 2990 argv[0].v_type = VAR_CHANNEL;
2991 argv[0].vval.v_channel = channel; 2991 argv[0].vval.v_channel = channel;
2992 call_func(channel->ch_close_cb, (int)STRLEN(channel->ch_close_cb), 2992 call_func(channel->ch_close_cb, -1,
2993 &rettv, 1, argv, NULL, 0L, 0L, &dummy, TRUE, 2993 &rettv, 1, argv, NULL, 0L, 0L, &dummy, TRUE,
2994 channel->ch_close_partial, NULL); 2994 channel->ch_close_partial, NULL);
2995 clear_tv(&rettv); 2995 clear_tv(&rettv);
2996 channel_need_redraw = TRUE; 2996 channel_need_redraw = TRUE;
2997 2997
5476 ++job->jv_refcount; 5476 ++job->jv_refcount;
5477 argv[0].v_type = VAR_JOB; 5477 argv[0].v_type = VAR_JOB;
5478 argv[0].vval.v_job = job; 5478 argv[0].vval.v_job = job;
5479 argv[1].v_type = VAR_NUMBER; 5479 argv[1].v_type = VAR_NUMBER;
5480 argv[1].vval.v_number = job->jv_exitval; 5480 argv[1].vval.v_number = job->jv_exitval;
5481 call_func(job->jv_exit_cb, (int)STRLEN(job->jv_exit_cb), 5481 call_func(job->jv_exit_cb, -1,
5482 &rettv, 2, argv, NULL, 0L, 0L, &dummy, TRUE, 5482 &rettv, 2, argv, NULL, 0L, 0L, &dummy, TRUE,
5483 job->jv_exit_partial, NULL); 5483 job->jv_exit_partial, NULL);
5484 clear_tv(&rettv); 5484 clear_tv(&rettv);
5485 --job->jv_refcount; 5485 --job->jv_refcount;
5486 channel_need_redraw = TRUE; 5486 channel_need_redraw = TRUE;
6067 text += STRLEN(prompt); 6067 text += STRLEN(prompt);
6068 argv[0].v_type = VAR_STRING; 6068 argv[0].v_type = VAR_STRING;
6069 argv[0].vval.v_string = vim_strsave(text); 6069 argv[0].vval.v_string = vim_strsave(text);
6070 argv[1].v_type = VAR_UNKNOWN; 6070 argv[1].v_type = VAR_UNKNOWN;
6071 6071
6072 call_func(curbuf->b_prompt_callback, 6072 call_func(curbuf->b_prompt_callback, -1,
6073 (int)STRLEN(curbuf->b_prompt_callback),
6074 &rettv, 1, argv, NULL, 0L, 0L, &dummy, TRUE, 6073 &rettv, 1, argv, NULL, 0L, 0L, &dummy, TRUE,
6075 curbuf->b_prompt_partial, NULL); 6074 curbuf->b_prompt_partial, NULL);
6076 clear_tv(&argv[0]); 6075 clear_tv(&argv[0]);
6077 clear_tv(&rettv); 6076 clear_tv(&rettv);
6078 } 6077 }
6091 || *curbuf->b_prompt_interrupt == NUL) 6090 || *curbuf->b_prompt_interrupt == NUL)
6092 return FALSE; 6091 return FALSE;
6093 argv[0].v_type = VAR_UNKNOWN; 6092 argv[0].v_type = VAR_UNKNOWN;
6094 6093
6095 got_int = FALSE; // don't skip executing commands 6094 got_int = FALSE; // don't skip executing commands
6096 call_func(curbuf->b_prompt_interrupt, 6095 call_func(curbuf->b_prompt_interrupt, -1,
6097 (int)STRLEN(curbuf->b_prompt_interrupt),
6098 &rettv, 0, argv, NULL, 0L, 0L, &dummy, TRUE, 6096 &rettv, 0, argv, NULL, 0L, 0L, &dummy, TRUE,
6099 curbuf->b_prompt_int_partial, NULL); 6097 curbuf->b_prompt_int_partial, NULL);
6100 clear_tv(&rettv); 6098 clear_tv(&rettv);
6101 return TRUE; 6099 return TRUE;
6102 } 6100 }