IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-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 vim/vim#3759)
f2d79fa92d
This commit is contained in:
Jan Edmund Lazo 2019-01-05 23:09:19 -05:00
parent 758955d1b6
commit fba80f5edc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/eval.c
View File

@ -7103,7 +7103,7 @@ static void f_bufloaded(typval_T *argvars, typval_T *rettv, FunPtr fptr)
/* /*
* Get buffer by number or pattern. * Get buffer by number or pattern.
*/ */
static buf_T *get_buf_tv(typval_T *tv, int curtab_only) static buf_T *tv_get_buf(typval_T *tv, int curtab_only)
{ {
char_u *name = tv->vval.v_string; char_u *name = tv->vval.v_string;
int save_magic; int save_magic;
@ -7149,7 +7149,7 @@ static void f_bufname(typval_T *argvars, typval_T *rettv, FunPtr fptr)
return; return;
} }
emsg_off++; emsg_off++;
const buf_T *const buf = get_buf_tv(&argvars[0], false); const buf_T *const buf = tv_get_buf(&argvars[0], false);
emsg_off--; emsg_off--;
if (buf != NULL && buf->b_fname != NULL) { if (buf != NULL && buf->b_fname != NULL) {
rettv->vval.v_string = (char_u *)xstrdup((char *)buf->b_fname); rettv->vval.v_string = (char_u *)xstrdup((char *)buf->b_fname);
@ -7168,7 +7168,7 @@ static void f_bufnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
return; return;
} }
emsg_off++; emsg_off++;
const buf_T *buf = get_buf_tv(&argvars[0], false); const buf_T *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
@ -7195,7 +7195,7 @@ static void buf_win_common(typval_T *argvars, typval_T *rettv, bool get_nr)
} }
emsg_off++; emsg_off++;
buf_T *buf = get_buf_tv(&argvars[0], true); buf_T *buf = tv_get_buf(&argvars[0], true);
if (buf == NULL) { // no need to search if buffer was not found if (buf == NULL) { // no need to search if buffer was not found
rettv->vval.v_number = -1; rettv->vval.v_number = -1;
goto end; goto end;
@ -9280,7 +9280,7 @@ static void f_getbufinfo(typval_T *argvars, typval_T *rettv, FunPtr fptr)
// Information about one buffer. Argument specifies the buffer // Information about one buffer. Argument specifies the buffer
if (tv_check_num(&argvars[0])) { // issue errmsg if type error if (tv_check_num(&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;
@ -9376,7 +9376,7 @@ static void f_getbufline(typval_T *argvars, typval_T *rettv, FunPtr fptr)
if (tv_check_str_or_nr(&argvars[0])) { if (tv_check_str_or_nr(&argvars[0])) {
emsg_off++; emsg_off++;
buf = get_buf_tv(&argvars[0], false); buf = tv_get_buf(&argvars[0], false);
emsg_off--; emsg_off--;
} }
@ -9404,7 +9404,7 @@ static void f_getbufvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
const char *varname = tv_get_string_chk(&argvars[1]); const char *varname = tv_get_string_chk(&argvars[1]);
emsg_off++; emsg_off++;
buf_T *const buf = get_buf_tv(&argvars[0], false); buf_T *const buf = tv_get_buf(&argvars[0], false);
if (buf != NULL && varname != NULL) { if (buf != NULL && varname != NULL) {
// set curbuf to be our buf, temporarily // set curbuf to be our buf, temporarily
@ -14491,7 +14491,7 @@ static void f_setbufvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
return; return;
} }
const char *varname = tv_get_string_chk(&argvars[1]); const char *varname = tv_get_string_chk(&argvars[1]);
buf_T *const buf = get_buf_tv(&argvars[0], false); buf_T *const buf = tv_get_buf(&argvars[0], false);
typval_T *varp = &argvars[2]; typval_T *varp = &argvars[2];
if (buf != NULL && varname != NULL) { if (buf != NULL && varname != NULL) {