diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-11-19 16:12:15 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-11-19 16:12:15 -0500 |
| commit | 32ec851270ff93d3453450cba54162841f519283 (patch) | |
| tree | e7fe7ee0b8d590ca442cd0bd6bd44ff2fc7f9e91 /src/nvim/digraph.c | |
| parent | e8e3e6e798b789acc659b19f0c422c6444fc167c (diff) | |
| parent | 2b0d9bdeac987e8b25a69e762c8ae94092d87a34 (diff) | |
| download | rneovim-32ec851270ff93d3453450cba54162841f519283.tar.gz rneovim-32ec851270ff93d3453450cba54162841f519283.tar.bz2 rneovim-32ec851270ff93d3453450cba54162841f519283.zip | |
Merge pull request #1488 from fwalch/invert-wconversion
Invert -Wconversion handling & fix some warnings.
Diffstat (limited to 'src/nvim/digraph.c')
| -rw-r--r-- | src/nvim/digraph.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c index f41a16bc1b..ffba7d4276 100644 --- a/src/nvim/digraph.c +++ b/src/nvim/digraph.c @@ -2,7 +2,9 @@ /// /// code for digraphs +#include <assert.h> #include <stdbool.h> +#include <stdint.h> #include <inttypes.h> #include "nvim/vim.h" @@ -1582,7 +1584,7 @@ int getdigraph(int char1, int char2, int meta_char) /// @param str void putdigraph(char_u *str) { - int char1, char2, n; + char_u char1, char2; digr_T *dp; while (*str != NUL) { @@ -1609,7 +1611,9 @@ void putdigraph(char_u *str) EMSG(_(e_number_exp)); return; } - n = getdigits(&str); + long digits = getdigits(&str); + assert(digits <= INT_MAX); + int n = (int)digits; // If the digraph already exists, replace the result. dp = (digr_T *)user_digraphs.ga_data; @@ -1711,7 +1715,8 @@ static void printdigraph(digr_T *dp) if (char2cells(dp->result) == 1) { *p++ = ' '; } - vim_snprintf((char *)p, sizeof(buf) - (p - buf), " %3d", dp->result); + assert(p >= buf); + vim_snprintf((char *)p, sizeof(buf) - (size_t)(p - buf), " %3d", dp->result); msg_outtrans(buf); } } |