Mercurial > vim

comparison src/evalfunc.c @ 15355:73b153ed5af8 v8.1.0685

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0685: get_buf_tv() is named inconsistently commit https://github.com/vim/vim/commit/f2d79fa92d0ed90732f52dd88da4ad66c2c5ce13 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jan 3 22:19:27 2019 +0100 patch 8.1.0685: get_buf_tv() is named inconsistently Problem: get_buf_tv() is named inconsistently. Solution: Rename it to tv_get_buf(). (Yegappan Lakshmanan, closes https://github.com/vim/vim/issues/3759)
author Bram Moolenaar <Bram@vim.org>
date Thu, 03 Jan 2019 22:30:06 +0100
parents 8543eaf63f65
children 01ee8dc12313
comparison
equal deleted inserted replaced
15354:c094a45062aa 15355:73b153ed5af8
1422 f_appendbufline(typval_T *argvars, typval_T *rettv) 1422 f_appendbufline(typval_T *argvars, typval_T *rettv)
1423 { 1423 {
1424 linenr_T lnum; 1424 linenr_T lnum;
1425 buf_T *buf; 1425 buf_T *buf;
1426 1426
1427 buf = get_buf_tv(&argvars[0], FALSE); 1427 buf = tv_get_buf(&argvars[0], FALSE);
1428 if (buf == NULL) 1428 if (buf == NULL)
1429 rettv->vval.v_number = 1; /* FAIL */ 1429 rettv->vval.v_number = 1; /* FAIL */
1430 else 1430 else
1431 { 1431 {
1432 lnum = tv_get_lnum_buf(&argvars[1], buf); 1432 lnum = tv_get_lnum_buf(&argvars[1], buf);
1890 1890
1891 /* 1891 /*
1892 * Get buffer by number or pattern. 1892 * Get buffer by number or pattern.
1893 */ 1893 */
1894 buf_T * 1894 buf_T *
1895 get_buf_tv(typval_T *tv, int curtab_only) 1895 tv_get_buf(typval_T *tv, int curtab_only)
1896 { 1896 {
1897 char_u *name = tv->vval.v_string; 1897 char_u *name = tv->vval.v_string;
1898 buf_T *buf; 1898 buf_T *buf;
1899 1899
1900 if (tv->v_type == VAR_NUMBER) 1900 if (tv->v_type == VAR_NUMBER)
1923 { 1923 {
1924 buf_T *buf; 1924 buf_T *buf;
1925 1925
1926 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ 1926 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
1927 ++emsg_off; 1927 ++emsg_off;
1928 buf = get_buf_tv(&argvars[0], FALSE); 1928 buf = tv_get_buf(&argvars[0], FALSE);
1929 rettv->v_type = VAR_STRING; 1929 rettv->v_type = VAR_STRING;
1930 if (buf != NULL && buf->b_fname != NULL) 1930 if (buf != NULL && buf->b_fname != NULL)
1931 rettv->vval.v_string = vim_strsave(buf->b_fname); 1931 rettv->vval.v_string = vim_strsave(buf->b_fname);
1932 else 1932 else
1933 rettv->vval.v_string = NULL; 1933 rettv->vval.v_string = NULL;
1944 int error = FALSE; 1944 int error = FALSE;
1945 char_u *name; 1945 char_u *name;
1946 1946
1947 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ 1947 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
1948 ++emsg_off; 1948 ++emsg_off;
1949 buf = get_buf_tv(&argvars[0], FALSE); 1949 buf = tv_get_buf(&argvars[0], FALSE);
1950 --emsg_off; 1950 --emsg_off;
1951 1951
1952 /* If the buffer isn't found and the second argument is not zero create a 1952 /* If the buffer isn't found and the second argument is not zero create a
1953 * new buffer. */ 1953 * new buffer. */
1954 if (buf == NULL 1954 if (buf == NULL
1972 int winnr = 0; 1972 int winnr = 0;
1973 buf_T *buf; 1973 buf_T *buf;
1974 1974
1975 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ 1975 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
1976 ++emsg_off; 1976 ++emsg_off;
1977 buf = get_buf_tv(&argvars[0], TRUE); 1977 buf = tv_get_buf(&argvars[0], TRUE);
1978 FOR_ALL_WINDOWS(wp) 1978 FOR_ALL_WINDOWS(wp)
1979 { 1979 {
1980 ++winnr; 1980 ++winnr;
1981 if (wp->w_buffer == buf) 1981 if (wp->w_buffer == buf)
1982 break; 1982 break;
2960 buf_T *curbuf_save = NULL; 2960 buf_T *curbuf_save = NULL;
2961 win_T *curwin_save = NULL; 2961 win_T *curwin_save = NULL;
2962 tabpage_T *tp; 2962 tabpage_T *tp;
2963 win_T *wp; 2963 win_T *wp;
2964 2964
2965 buf = get_buf_tv(&argvars[0], FALSE); 2965 buf = tv_get_buf(&argvars[0], FALSE);
2966 if (buf == NULL) 2966 if (buf == NULL)
2967 { 2967 {
2968 rettv->vval.v_number = 1; /* FAIL */ 2968 rettv->vval.v_number = 1; /* FAIL */
2969 return; 2969 return;
2970 } 2970 }
4523 else if (argvars[0].v_type != VAR_UNKNOWN) 4523 else if (argvars[0].v_type != VAR_UNKNOWN)
4524 { 4524 {
4525 /* Information about one buffer. Argument specifies the buffer */ 4525 /* Information about one buffer. Argument specifies the buffer */
4526 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ 4526 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
4527 ++emsg_off; 4527 ++emsg_off;
4528 argbuf = get_buf_tv(&argvars[0], FALSE); 4528 argbuf = tv_get_buf(&argvars[0], FALSE);
4529 --emsg_off; 4529 --emsg_off;
4530 if (argbuf == NULL) 4530 if (argbuf == NULL)
4531 return; 4531 return;
4532 } 4532 }
4533 4533
4607 linenr_T end; 4607 linenr_T end;
4608 buf_T *buf; 4608 buf_T *buf;
4609 4609
4610 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ 4610 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
4611 ++emsg_off; 4611 ++emsg_off;
4612 buf = get_buf_tv(&argvars[0], FALSE); 4612 buf = tv_get_buf(&argvars[0], FALSE);
4613 --emsg_off; 4613 --emsg_off;
4614 4614
4615 lnum = tv_get_lnum_buf(&argvars[1], buf); 4615 lnum = tv_get_lnum_buf(&argvars[1], buf);
4616 if (argvars[2].v_type == VAR_UNKNOWN) 4616 if (argvars[2].v_type == VAR_UNKNOWN)
4617 end = lnum; 4617 end = lnum;
4634 int done = FALSE; 4634 int done = FALSE;
4635 4635
4636 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ 4636 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
4637 varname = tv_get_string_chk(&argvars[1]); 4637 varname = tv_get_string_chk(&argvars[1]);
4638 ++emsg_off; 4638 ++emsg_off;
4639 buf = get_buf_tv(&argvars[0], FALSE); 4639 buf = tv_get_buf(&argvars[0], FALSE);
4640 4640
4641 rettv->v_type = VAR_STRING; 4641 rettv->v_type = VAR_STRING;
4642 rettv->vval.v_string = NULL; 4642 rettv->vval.v_string = NULL;
4643 4643
4644 if (buf != NULL && varname != NULL) 4644 if (buf != NULL && varname != NULL)
4705 return; 4705 return;
4706 4706
4707 #ifdef FEAT_JUMPLIST 4707 #ifdef FEAT_JUMPLIST
4708 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ 4708 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
4709 ++emsg_off; 4709 ++emsg_off;
4710 buf = get_buf_tv(&argvars[0], FALSE); 4710 buf = tv_get_buf(&argvars[0], FALSE);
4711 --emsg_off; 4711 --emsg_off;
4712 if (buf == NULL) 4712 if (buf == NULL)
4713 return; 4713 return;
4714 4714
4715 l = list_alloc(); 4715 l = list_alloc();
8719 char_u *callback; 8719 char_u *callback;
8720 partial_T *partial; 8720 partial_T *partial;
8721 8721
8722 if (check_secure()) 8722 if (check_secure())
8723 return; 8723 return;
8724 buf = get_buf_tv(&argvars[0], FALSE); 8724 buf = tv_get_buf(&argvars[0], FALSE);
8725 if (buf == NULL) 8725 if (buf == NULL)
8726 return; 8726 return;
8727 8727
8728 callback = get_callback(&argvars[1], &partial); 8728 callback = get_callback(&argvars[1], &partial);
8729 if (callback == NULL) 8729 if (callback == NULL)
8748 char_u *callback; 8748 char_u *callback;
8749 partial_T *partial; 8749 partial_T *partial;
8750 8750
8751 if (check_secure()) 8751 if (check_secure())
8752 return; 8752 return;
8753 buf = get_buf_tv(&argvars[0], FALSE); 8753 buf = tv_get_buf(&argvars[0], FALSE);
8754 if (buf == NULL) 8754 if (buf == NULL)
8755 return; 8755 return;
8756 8756
8757 callback = get_callback(&argvars[1], &partial); 8757 callback = get_callback(&argvars[1], &partial);
8758 if (callback == NULL) 8758 if (callback == NULL)
8776 buf_T *buf; 8776 buf_T *buf;
8777 char_u *text; 8777 char_u *text;
8778 8778
8779 if (check_secure()) 8779 if (check_secure())
8780 return; 8780 return;
8781 buf = get_buf_tv(&argvars[0], FALSE); 8781 buf = tv_get_buf(&argvars[0], FALSE);
8782 if (buf == NULL) 8782 if (buf == NULL)
8783 return; 8783 return;
8784 8784
8785 text = tv_get_string(&argvars[1]); 8785 text = tv_get_string(&argvars[1]);
8786 vim_free(buf->b_prompt_text); 8786 vim_free(buf->b_prompt_text);
10578 f_setbufline(typval_T *argvars, typval_T *rettv) 10578 f_setbufline(typval_T *argvars, typval_T *rettv)
10579 { 10579 {
10580 linenr_T lnum; 10580 linenr_T lnum;
10581 buf_T *buf; 10581 buf_T *buf;
10582 10582
10583 buf = get_buf_tv(&argvars[0], FALSE); 10583 buf = tv_get_buf(&argvars[0], FALSE);
10584 if (buf == NULL) 10584 if (buf == NULL)
10585 rettv->vval.v_number = 1; /* FAIL */ 10585 rettv->vval.v_number = 1; /* FAIL */
10586 else 10586 else
10587 { 10587 {
10588 lnum = tv_get_lnum_buf(&argvars[1], buf); 10588 lnum = tv_get_lnum_buf(&argvars[1], buf);
10603 10603
10604 if (check_restricted() || check_secure()) 10604 if (check_restricted() || check_secure())
10605 return; 10605 return;
10606 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */ 10606 (void)tv_get_number(&argvars[0]); /* issue errmsg if type error */
10607 varname = tv_get_string_chk(&argvars[1]); 10607 varname = tv_get_string_chk(&argvars[1]);
10608 buf = get_buf_tv(&argvars[0], FALSE); 10608 buf = tv_get_buf(&argvars[0], FALSE);
10609 varp = &argvars[2]; 10609 varp = &argvars[2];
10610 10610
10611 if (buf != NULL && varname != NULL && varp != NULL) 10611 if (buf != NULL && varname != NULL && varp != NULL)
10612 { 10612 {
10613 if (*varname == '&') 10613 if (*varname == '&')
11363 return; 11363 return;
11364 11364
11365 if (argvars[0].v_type != VAR_UNKNOWN) 11365 if (argvars[0].v_type != VAR_UNKNOWN)
11366 { 11366 {
11367 // get signs placed in this buffer 11367 // get signs placed in this buffer
11368 buf = get_buf_tv(&argvars[0], FALSE); 11368 buf = tv_get_buf(&argvars[0], FALSE);
11369 if (buf == NULL) 11369 if (buf == NULL)
11370 { 11370 {
11371 EMSG2(_("E158: Invalid buffer name: %s"), 11371 EMSG2(_("E158: Invalid buffer name: %s"),
11372 tv_get_string(&argvars[0])); 11372 tv_get_string(&argvars[0]));
11373 return; 11373 return;
11455 sign_name = tv_get_string_chk(&argvars[2]); 11455 sign_name = tv_get_string_chk(&argvars[2]);
11456 if (sign_name == NULL) 11456 if (sign_name == NULL)
11457 goto cleanup; 11457 goto cleanup;
11458 11458
11459 // Buffer to place the sign 11459 // Buffer to place the sign
11460 buf = get_buf_tv(&argvars[3], FALSE); 11460 buf = tv_get_buf(&argvars[3], FALSE);
11461 if (buf == NULL) 11461 if (buf == NULL)
11462 { 11462 {
11463 EMSG2(_("E158: Invalid buffer name: %s"), tv_get_string(&argvars[2])); 11463 EMSG2(_("E158: Invalid buffer name: %s"), tv_get_string(&argvars[2]));
11464 goto cleanup; 11464 goto cleanup;
11465 } 11465 }
11564 } 11564 }
11565 dict = argvars[1].vval.v_dict; 11565 dict = argvars[1].vval.v_dict;
11566 11566
11567 if ((di = dict_find(dict, (char_u *)"buffer", -1)) != NULL) 11567 if ((di = dict_find(dict, (char_u *)"buffer", -1)) != NULL)
11568 { 11568 {
11569 buf = get_buf_tv(&di->di_tv, FALSE); 11569 buf = tv_get_buf(&di->di_tv, FALSE);
11570 if (buf == NULL) 11570 if (buf == NULL)
11571 { 11571 {
11572 EMSG2(_("E158: Invalid buffer name: %s"), 11572 EMSG2(_("E158: Invalid buffer name: %s"),
11573 tv_get_string(&di->di_tv)); 11573 tv_get_string(&di->di_tv));
11574 goto cleanup; 11574 goto cleanup;
12810 f_swapname(typval_T *argvars, typval_T *rettv) 12810 f_swapname(typval_T *argvars, typval_T *rettv)
12811 { 12811 {
12812 buf_T *buf; 12812 buf_T *buf;
12813 12813
12814 rettv->v_type = VAR_STRING; 12814 rettv->v_type = VAR_STRING;
12815 buf = get_buf_tv(&argvars[0], FALSE); 12815 buf = tv_get_buf(&argvars[0], FALSE);
12816 if (buf == NULL || buf->b_ml.ml_mfp == NULL 12816 if (buf == NULL || buf->b_ml.ml_mfp == NULL
12817 || buf->b_ml.ml_mfp->mf_fname == NULL) 12817 || buf->b_ml.ml_mfp->mf_fname == NULL)
12818 rettv->vval.v_string = NULL; 12818 rettv->vval.v_string = NULL;
12819 else 12819 else
12820 rettv->vval.v_string = vim_strsave(buf->b_ml.ml_mfp->mf_fname); 12820 rettv->vval.v_string = vim_strsave(buf->b_ml.ml_mfp->mf_fname);