diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-12-19 06:42:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-19 06:42:42 +0100 |
| commit | ccb005b9e0d509bbe595515e7e17b0e9713a2c19 (patch) | |
| tree | 59803aebf072172af32319e89fe52d90d5d0270b /src/nvim/strings.c | |
| parent | cb76a8a95f3a2fc7ac4f7a56720cec62f33160eb (diff) | |
| parent | 4680ca29f1933fd7bc17fc2638b8bfb2e20d5415 (diff) | |
| download | rneovim-ccb005b9e0d509bbe595515e7e17b0e9713a2c19.tar.gz rneovim-ccb005b9e0d509bbe595515e7e17b0e9713a2c19.tar.bz2 rneovim-ccb005b9e0d509bbe595515e7e17b0e9713a2c19.zip | |
Merge #9369 'vim-patch:8.1.0596'
Diffstat (limited to 'src/nvim/strings.c')
| -rw-r--r-- | src/nvim/strings.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/strings.c b/src/nvim/strings.c index 3b0a950ff2..87593f577b 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -1001,8 +1001,8 @@ int vim_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap, switch (length_modifier) { case '\0': case 'h': { - // char and short arguments are passed as int - arg = (tvs ? (int)tv_nr(tvs, &arg_idx) : va_arg(ap, int)); + // char and short arguments are passed as int16_t + arg = (int16_t)(tvs ? tv_nr(tvs, &arg_idx) : va_arg(ap, int)); break; } case 'l': { @@ -1033,9 +1033,9 @@ int vim_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap, switch (length_modifier) { case '\0': case 'h': { - uarg = (tvs - ? (unsigned)tv_nr(tvs, &arg_idx) - : va_arg(ap, unsigned)); + uarg = (uint16_t)(tvs + ? tv_nr(tvs, &arg_idx) + : va_arg(ap, unsigned)); break; } case 'l': { |