aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2017-03-22 03:49:45 -0400
committerJustin M. Keyes <justinkz@gmail.com>2017-03-22 03:21:32 +0100
commit56e400d800b9eb6c89ea8336c50d2a61cc8fd18b (patch)
tree47176c94690e05ef9ebe762b7a793a24336b8872 /src
parent7cc4e782a0d14be0bf648b3b938b1577bbb70df6 (diff)
downloadrneovim-56e400d800b9eb6c89ea8336c50d2a61cc8fd18b.tar.gz
rneovim-56e400d800b9eb6c89ea8336c50d2a61cc8fd18b.tar.bz2
rneovim-56e400d800b9eb6c89ea8336c50d2a61cc8fd18b.zip
vim_vsnprintf: fix conversion warning #6333
Re-apply fix from #6311 which was accidentally regressed in #6231.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/strings.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index 7ec2ea13f7..267832ed2d 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -1255,7 +1255,9 @@ int vim_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap,
l += (size_t)snprintf(format + l, sizeof(format) - l, ".%d",
(int)precision);
}
- format[l] = fmt_spec == 'F' ? 'f' : fmt_spec;
+
+ // Cast to char to avoid a conversion warning on Ubuntu 12.04.
+ format[l] = (char)(fmt_spec == 'F' ? 'f' : fmt_spec);
format[l + 1] = NUL;
// Regular float number