aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.0685: get_buf_tv() is named inconsistently

Browse Source 
Problem:    get_buf_tv() is named inconsistently.
Solution:   Rename it to tv_get_buf(). (Yegappan Lakshmanan, closes #3759)
This commit is contained in:
Bram Moolenaar 2019-01-03 22:19:27 +01:00
parent 4b7214ea78
commit f2d79fa92d
5 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/evalfunc.c
View File

@ -1424,7 +1424,7 @@ f_appendbufline(typval_T *argvars, typval_T *rettv)
linenr_T lnum; linenr_T lnum;
buf_T *buf; buf_T *buf;
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
if (buf == NULL) if (buf == NULL)
rettv->vval.v_number = 1; /* FAIL */ rettv->vval.v_number = 1; /* FAIL */
else else
@ -1892,7 +1892,7 @@ buflist_find_by_name(char_u *name, int curtab_only)
* Get buffer by number or pattern. * Get buffer by number or pattern.
*/ */
buf_T * buf_T *
get_buf_tv(typval_T *tv, int curtab_only) tv_get_buf(typval_T *tv, int curtab_only)
{ {
char_u *name = tv->vval.v_string; char_u *name = tv->vval.v_string;
buf_T *buf; buf_T *buf;
@ -1925,7 +1925,7 @@ f_bufname(typval_T *argvars, typval_T *rettv)
(void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
++emsg_off; ++emsg_off;
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
rettv->v_type = VAR_STRING; rettv->v_type = VAR_STRING;
if (buf != NULL && buf->b_fname != NULL) if (buf != NULL && buf->b_fname != NULL)
rettv->vval.v_string = vim_strsave(buf->b_fname); rettv->vval.v_string = vim_strsave(buf->b_fname);
@ -1946,7 +1946,7 @@ f_bufnr(typval_T *argvars, typval_T *rettv)
(void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
++emsg_off; ++emsg_off;
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
--emsg_off; --emsg_off;
/* If the buffer isn't found and the second argument is not zero create a /* If the buffer isn't found and the second argument is not zero create a
@ -1974,7 +1974,7 @@ buf_win_common(typval_T *argvars, typval_T *rettv, int get_nr)
(void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
++emsg_off; ++emsg_off;
buf = get_buf_tv(&argvars[0], TRUE); buf = tv_get_buf(&argvars[0], TRUE);
FOR_ALL_WINDOWS(wp) FOR_ALL_WINDOWS(wp)
{ {
++winnr; ++winnr;
@ -2962,7 +2962,7 @@ f_deletebufline(typval_T *argvars, typval_T *rettv)
tabpage_T *tp; tabpage_T *tp;
win_T *wp; win_T *wp;
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
if (buf == NULL) if (buf == NULL)
{ {
rettv->vval.v_number = 1; /* FAIL */ rettv->vval.v_number = 1; /* FAIL */
@ -4525,7 +4525,7 @@ f_getbufinfo(typval_T *argvars, typval_T *rettv)
/* Information about one buffer. Argument specifies the buffer */ /* Information about one buffer. Argument specifies the buffer */
(void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
++emsg_off; ++emsg_off;
argbuf = get_buf_tv(&argvars[0], FALSE); argbuf = tv_get_buf(&argvars[0], FALSE);
--emsg_off; --emsg_off;
if (argbuf == NULL) if (argbuf == NULL)
return; return;
@ -4609,7 +4609,7 @@ f_getbufline(typval_T *argvars, typval_T *rettv)
(void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
++emsg_off; ++emsg_off;
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
--emsg_off; --emsg_off;
lnum = tv_get_lnum_buf(&argvars[1], buf); lnum = tv_get_lnum_buf(&argvars[1], buf);
@ -4636,7 +4636,7 @@ f_getbufvar(typval_T *argvars, typval_T *rettv)
(void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
varname = tv_get_string_chk(&argvars[1]); varname = tv_get_string_chk(&argvars[1]);
++emsg_off; ++emsg_off;
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
rettv->v_type = VAR_STRING; rettv->v_type = VAR_STRING;
rettv->vval.v_string = NULL; rettv->vval.v_string = NULL;
@ -4707,7 +4707,7 @@ f_getchangelist(typval_T *argvars, typval_T *rettv)
#ifdef FEAT_JUMPLIST #ifdef FEAT_JUMPLIST
(void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
++emsg_off; ++emsg_off;
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
--emsg_off; --emsg_off;
if (buf == NULL) if (buf == NULL)
return; return;
@ -8721,7 +8721,7 @@ f_prompt_setcallback(typval_T *argvars, typval_T *rettv UNUSED)
if (check_secure()) if (check_secure())
return; return;
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
if (buf == NULL) if (buf == NULL)
return; return;
@ -8750,7 +8750,7 @@ f_prompt_setinterrupt(typval_T *argvars, typval_T *rettv UNUSED)
if (check_secure()) if (check_secure())
return; return;
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
if (buf == NULL) if (buf == NULL)
return; return;
@ -8778,7 +8778,7 @@ f_prompt_setprompt(typval_T *argvars, typval_T *rettv UNUSED)
if (check_secure()) if (check_secure())
return; return;
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
if (buf == NULL) if (buf == NULL)
return; return;
@ -10580,7 +10580,7 @@ f_setbufline(typval_T *argvars, typval_T *rettv)
linenr_T lnum; linenr_T lnum;
buf_T *buf; buf_T *buf;
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
if (buf == NULL) if (buf == NULL)
rettv->vval.v_number = 1; /* FAIL */ rettv->vval.v_number = 1; /* FAIL */
else else
@ -10605,7 +10605,7 @@ f_setbufvar(typval_T *argvars, typval_T *rettv UNUSED)
return; return;
(void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
varname = tv_get_string_chk(&argvars[1]); varname = tv_get_string_chk(&argvars[1]);
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
varp = &argvars[2]; varp = &argvars[2];
if (buf != NULL && varname != NULL && varp != NULL) if (buf != NULL && varname != NULL && varp != NULL)
@ -11365,7 +11365,7 @@ f_sign_getplaced(typval_T *argvars, typval_T *rettv)
if (argvars[0].v_type != VAR_UNKNOWN) if (argvars[0].v_type != VAR_UNKNOWN)
{ {
// get signs placed in this buffer // get signs placed in this buffer
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
if (buf == NULL) if (buf == NULL)
{ {
EMSG2(_("E158: Invalid buffer name: %s"), EMSG2(_("E158: Invalid buffer name: %s"),
@ -11457,7 +11457,7 @@ f_sign_place(typval_T *argvars, typval_T *rettv)
goto cleanup; goto cleanup;
// Buffer to place the sign // Buffer to place the sign
buf = get_buf_tv(&argvars[3], FALSE); buf = tv_get_buf(&argvars[3], FALSE);
if (buf == NULL) if (buf == NULL)
{ {
EMSG2(_("E158: Invalid buffer name: %s"), tv_get_string(&argvars[2])); EMSG2(_("E158: Invalid buffer name: %s"), tv_get_string(&argvars[2]));
@ -11566,7 +11566,7 @@ f_sign_unplace(typval_T *argvars, typval_T *rettv)
if ((di = dict_find(dict, (char_u *)"buffer", -1)) != NULL) if ((di = dict_find(dict, (char_u *)"buffer", -1)) != NULL)
{ {
buf = get_buf_tv(&di->di_tv, FALSE); buf = tv_get_buf(&di->di_tv, FALSE);
if (buf == NULL) if (buf == NULL)
{ {
EMSG2(_("E158: Invalid buffer name: %s"), EMSG2(_("E158: Invalid buffer name: %s"),
@ -12812,7 +12812,7 @@ f_swapname(typval_T *argvars, typval_T *rettv)
buf_T *buf; buf_T *buf;
rettv->v_type = VAR_STRING; rettv->v_type = VAR_STRING;
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
if (buf == NULL || buf->b_ml.ml_mfp == NULL if (buf == NULL || buf->b_ml.ml_mfp == NULL
|| buf->b_ml.ml_mfp->mf_fname == NULL) || buf->b_ml.ml_mfp->mf_fname == NULL)
rettv->vval.v_string = NULL; rettv->vval.v_string = NULL;

2
src/proto/evalfunc.pro
View File

@ -4,7 +4,7 @@ char_u *get_expr_name(expand_T *xp, int idx);
int find_internal_func(char_u *name); int find_internal_func(char_u *name);
int call_internal_func(char_u *name, int argcount, typval_T *argvars, typval_T *rettv); int call_internal_func(char_u *name, int argcount, typval_T *argvars, typval_T *rettv);
buf_T *buflist_find_by_name(char_u *name, int curtab_only); buf_T *buflist_find_by_name(char_u *name, int curtab_only);
buf_T *get_buf_tv(typval_T *tv, int curtab_only); buf_T *tv_get_buf(typval_T *tv, int curtab_only);
void execute_redir_str(char_u *value, int value_len); void execute_redir_str(char_u *value, int value_len);
void mzscheme_call_vim(char_u *name, typval_T *args, typval_T *rettv); void mzscheme_call_vim(char_u *name, typval_T *args, typval_T *rettv);
float_T vim_round(float_T f); float_T vim_round(float_T f);

2
src/terminal.c
View File

@ -3842,7 +3842,7 @@ term_get_buf(typval_T *argvars, char *where)
(void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
++emsg_off; ++emsg_off;
buf = get_buf_tv(&argvars[0], FALSE); buf = tv_get_buf(&argvars[0], FALSE);
--emsg_off; --emsg_off;
if (buf == NULL || buf->b_term == NULL) if (buf == NULL || buf->b_term == NULL)
{ {

4
src/textprop.c
View File

@ -130,7 +130,7 @@ get_bufnr_from_arg(typval_T *arg, buf_T **buf)
di = dict_find(arg->vval.v_dict, (char_u *)"bufnr", -1); di = dict_find(arg->vval.v_dict, (char_u *)"bufnr", -1);
if (di != NULL) if (di != NULL)
{ {
*buf = get_buf_tv(&di->di_tv, FALSE); *buf = tv_get_buf(&di->di_tv, FALSE);
if (*buf == NULL) if (*buf == NULL)
return FAIL; return FAIL;
} }
@ -533,7 +533,7 @@ f_prop_remove(typval_T *argvars, typval_T *rettv)
di = dict_find(dict, (char_u *)"bufnr", -1); di = dict_find(dict, (char_u *)"bufnr", -1);
if (di != NULL) if (di != NULL)
{ {
buf = get_buf_tv(&di->di_tv, FALSE); buf = tv_get_buf(&di->di_tv, FALSE);
if (buf == NULL) if (buf == NULL)
return; return;
} }

2
src/version.c
View File

@ -799,6 +799,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
685,
/**/ /**/
684, 684,
/**/ /**/