From 690e43b461491507094da8eeb48a92cf2f38b282 Mon Sep 17 00:00:00 2001 From: Eliseo Martínez Date: Wed, 11 Feb 2015 18:46:00 +0100 Subject: Enable -Wconversion: Passing-by: Remove dead code (MACOS_CONVERT). MacOS (pre Mac OS X) is not supported anymore. --- src/nvim/os_unix.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/nvim/os_unix.c') diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index 455ed737ff..0fc45c9543 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 -- cgit From 36340803afe1504f15468a715172c25cfef6974c Mon Sep 17 00:00:00 2001 From: Eliseo Martínez Date: Thu, 12 Feb 2015 17:28:35 +0100 Subject: Enable -Wconversion: os_unix.c. --- src/nvim/os_unix.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/nvim/os_unix.c') 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. -- cgit