diff options
| author | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-02-12 17:28:35 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-02-18 20:54:14 -0500 |
| commit | 36340803afe1504f15468a715172c25cfef6974c (patch) | |
| tree | e80358ae4795597680b45fe984dc5f2e9ce20237 /src/nvim/os_unix.c | |
| parent | cbabf9491b5dee3d06e4c0d594a5f085bdddb126 (diff) | |
| download | rneovim-36340803afe1504f15468a715172c25cfef6974c.tar.gz rneovim-36340803afe1504f15468a715172c25cfef6974c.tar.bz2 rneovim-36340803afe1504f15468a715172c25cfef6974c.zip | |
Enable -Wconversion: os_unix.c.
Diffstat (limited to 'src/nvim/os_unix.c')
| -rw-r--r-- | src/nvim/os_unix.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index 0fc45c9543..bfdf5969ff 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -730,7 +730,10 @@ int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file, { redraw_later_clear(); /* probably messed up screen */ msg_putchar('\n'); /* clear bottom line quickly */ - cmdline_row = Rows - 1; /* continue on last line */ +#if SIZEOF_LONG > SIZEOF_INT + assert(Rows <= (long)INT_MAX + 1); +#endif + cmdline_row = (int)(Rows - 1); /* continue on last line */ MSG(_(e_wildexpand)); msg_start(); /* don't overwrite this message */ } @@ -858,7 +861,7 @@ int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file, goto notfound; } *num_file = i; - *file = (char_u **)xmalloc(sizeof(char_u *) * i); + *file = xmalloc(sizeof(char_u *) * (size_t)i); /* * Isolate the individual file names. |