diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-02-18 20:54:15 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-02-18 20:54:15 -0500 |
| commit | b1d079c83b3dd459114d1ba7c2ff1b07a9ee3e9e (patch) | |
| tree | e80358ae4795597680b45fe984dc5f2e9ce20237 /src/nvim/os_unix.c | |
| parent | 366662d932551e558d10f09887ddf144ed5db34b (diff) | |
| parent | 36340803afe1504f15468a715172c25cfef6974c (diff) | |
| download | rneovim-b1d079c83b3dd459114d1ba7c2ff1b07a9ee3e9e.tar.gz rneovim-b1d079c83b3dd459114d1ba7c2ff1b07a9ee3e9e.tar.bz2 rneovim-b1d079c83b3dd459114d1ba7c2ff1b07a9ee3e9e.zip | |
Merge #1979 'Enable -Wconversion'
Diffstat (limited to 'src/nvim/os_unix.c')
| -rw-r--r-- | src/nvim/os_unix.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index 455ed737ff..bfdf5969ff 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -415,10 +415,6 @@ void mch_exit(int r) out_flush(); ml_close_all(TRUE); /* remove all memfiles */ -#ifdef MACOS_CONVERT - mac_conv_cleanup(); -#endif - event_teardown(); #ifdef EXITFREE @@ -734,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 */ } @@ -862,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. |