diff options
| author | James McCoy <jamessan@jamessan.com> | 2021-10-18 09:08:46 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2021-11-01 06:41:28 -0400 |
| commit | efa924f66b183d9cf2404ce91c4f009c27e0515a (patch) | |
| tree | adc8c74cba88e76c2ae0548cd6e9b01804da9933 /src/nvim/strings.c | |
| parent | 684640f5518a483cf2bc48efc8f68449379cef69 (diff) | |
| download | rneovim-efa924f66b183d9cf2404ce91c4f009c27e0515a.tar.gz rneovim-efa924f66b183d9cf2404ce91c4f009c27e0515a.tar.bz2 rneovim-efa924f66b183d9cf2404ce91c4f009c27e0515a.zip | |
vim-patch:8.1.0743: giving error messages is not flexible
Problem: Giving error messages is not flexible.
Solution: Add semsg(). Change argument from "char_u *" to "char *", also
for msg() and get rid of most MSG macros. (Ozaki Kiichi, closes
vim/vim#3302) Also make emsg() accept a "char *" argument. Get rid of
an enormous number of type casts.
https://github.com/vim/vim/commit/f9e3e09fdc93be9f0d47afbc6c7df1188c2a5a0d
Diffstat (limited to 'src/nvim/strings.c')
| -rw-r--r-- | src/nvim/strings.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/strings.c b/src/nvim/strings.c index b405650b0e..688ac548c0 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -557,7 +557,7 @@ static varnumber_T tv_nr(typval_T *tvs, int *idxp) varnumber_T n = 0; if (tvs[idx].v_type == VAR_UNKNOWN) { - EMSG(_(e_printf)); + emsg(_(e_printf)); } else { (*idxp)++; bool err = false; @@ -590,7 +590,7 @@ static const char *tv_str(typval_T *tvs, int *idxp, char **const tofree) const char *s = NULL; if (tvs[idx].v_type == VAR_UNKNOWN) { - EMSG(_(e_printf)); + emsg(_(e_printf)); } else { (*idxp)++; if (tvs[idx].v_type == VAR_STRING || tvs[idx].v_type == VAR_NUMBER) { @@ -627,7 +627,7 @@ static const void *tv_ptr(const typval_T *const tvs, int *const idxp) #undef OFF const int idx = *idxp - 1; if (tvs[idx].v_type == VAR_UNKNOWN) { - EMSG(_(e_printf)); + emsg(_(e_printf)); return NULL; } else { (*idxp)++; @@ -652,7 +652,7 @@ static float_T tv_float(typval_T *const tvs, int *const idxp) float_T f = 0; if (tvs[idx].v_type == VAR_UNKNOWN) { - EMSG(_(e_printf)); + emsg(_(e_printf)); } else { (*idxp)++; if (tvs[idx].v_type == VAR_FLOAT) { @@ -660,7 +660,7 @@ static float_T tv_float(typval_T *const tvs, int *const idxp) } else if (tvs[idx].v_type == VAR_NUMBER) { f = (float_T)tvs[idx].vval.v_number; } else { - EMSG(_("E807: Expected Float argument for printf()")); + emsg(_("E807: Expected Float argument for printf()")); } } return f; @@ -706,7 +706,7 @@ static float_T tv_float(typval_T *const tvs, int *const idxp) /// Append a formatted value to the string /// /// @see vim_vsnprintf_typval(). -int vim_snprintf_add(char *str, size_t str_m, char *fmt, ...) +int vim_snprintf_add(char *str, size_t str_m, const char *fmt, ...) FUNC_ATTR_PRINTF(3, 4) { const size_t len = strlen(str); @@ -1456,7 +1456,7 @@ int vim_vsnprintf_typval(char *str, size_t str_m, const char *fmt, va_list ap, t } if (tvs && tvs[arg_idx - 1].v_type != VAR_UNKNOWN) { - EMSG(_("E767: Too many arguments to printf()")); + emsg(_("E767: Too many arguments to printf()")); } // return the number of characters formatted (excluding trailing nul |