diff options
| author | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-01-14 13:59:17 +0100 |
|---|---|---|
| committer | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-01-19 19:47:28 +0100 |
| commit | 2ceb1c74d591a07183ee02baf6ff1e205c87c6b8 (patch) | |
| tree | 838ad082ecbe457dd4d33bd52bf4e8bdb213530c /src/nvim/misc1.c | |
| parent | 79b5a629eb3fcabbca4b3f215e341823ff3099bd (diff) | |
| download | rneovim-2ceb1c74d591a07183ee02baf6ff1e205c87c6b8.tar.gz rneovim-2ceb1c74d591a07183ee02baf6ff1e205c87c6b8.tar.bz2 rneovim-2ceb1c74d591a07183ee02baf6ff1e205c87c6b8.zip | |
Remove long_u: regexp: Refactor long_u.
Diffstat (limited to 'src/nvim/misc1.c')
| -rw-r--r-- | src/nvim/misc1.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index f756201efb..aa4d2b38db 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -10,6 +10,7 @@ * misc1.c: functions that didn't seem to fit elsewhere */ +#include <assert.h> #include <errno.h> #include <inttypes.h> #include <stdbool.h> @@ -1271,7 +1272,7 @@ plines_win_nofill ( int plines_win_nofold(win_T *wp, linenr_T lnum) { char_u *s; - long col; + unsigned int col; int width; s = ml_get_buf(wp->w_buffer, lnum, FALSE); @@ -1292,11 +1293,12 @@ int plines_win_nofold(win_T *wp, linenr_T lnum) width = wp->w_width - win_col_off(wp); if (width <= 0) return 32000; - if (col <= width) + if (col <= (unsigned int)width) return 1; col -= width; width += win_col_off2(wp); - return (col + (width - 1)) / width + 1; + assert(col <= INT_MAX && (int)col < INT_MAX - (width -1)); + return ((int)col + (width - 1)) / width + 1; } /* |