diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-04-07 03:43:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-07 03:43:36 +0200 |
| commit | 805b5f2e1ec074648e2142c1eaab1d2c089aa58d (patch) | |
| tree | 64a3405bbc6c28580507d4de4a281932f719f7e5 /src/nvim/eval.c | |
| parent | cf072cf223287d37c1c59926ff4600d249e1522c (diff) | |
| parent | 4d6e99c94913676cc7a6581c13579e5f9fbe26c5 (diff) | |
| download | rneovim-805b5f2e1ec074648e2142c1eaab1d2c089aa58d.tar.gz rneovim-805b5f2e1ec074648e2142c1eaab1d2c089aa58d.tar.bz2 rneovim-805b5f2e1ec074648e2142c1eaab1d2c089aa58d.zip | |
Merge #9840 from janlazo/vim-8.0.0709
vim-patch:8.0.{709,728},8.1.{135,308}
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 7279f772ac..929304a874 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -11639,10 +11639,11 @@ static void dict_list(typval_T *const tv, typval_T *const rettv, static void f_id(typval_T *argvars, typval_T *rettv, FunPtr fptr) FUNC_ATTR_NONNULL_ALL { - const int len = vim_vsnprintf(NULL, 0, "%p", dummy_ap, argvars); + const int len = vim_vsnprintf_typval(NULL, 0, "%p", dummy_ap, argvars); rettv->v_type = VAR_STRING; rettv->vval.v_string = xmalloc(len + 1); - vim_vsnprintf((char *)rettv->vval.v_string, len + 1, "%p", dummy_ap, argvars); + vim_vsnprintf_typval((char *)rettv->vval.v_string, len + 1, "%p", + dummy_ap, argvars); } /* @@ -13106,11 +13107,11 @@ static void f_printf(typval_T *argvars, typval_T *rettv, FunPtr fptr) did_emsg = false; char buf[NUMBUFLEN]; const char *fmt = tv_get_string_buf(&argvars[0], buf); - len = vim_vsnprintf(NULL, 0, fmt, dummy_ap, argvars + 1); + len = vim_vsnprintf_typval(NULL, 0, fmt, dummy_ap, argvars + 1); if (!did_emsg) { char *s = xmalloc(len + 1); rettv->vval.v_string = (char_u *)s; - (void)vim_vsnprintf(s, len + 1, fmt, dummy_ap, argvars + 1); + (void)vim_vsnprintf_typval(s, len + 1, fmt, dummy_ap, argvars + 1); } did_emsg |= saved_did_emsg; } |