diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-08-04 21:35:46 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-08-05 03:35:46 +0200 |
| commit | 6871445dfe80939df81517870f0b29a2b40dd9d9 (patch) | |
| tree | 5aa1686b625d2594eb0b3213469d961392193c37 | |
| parent | 45c34bd84aa512b262f9d60e3f25f547cb5c189a (diff) | |
| download | rneovim-6871445dfe80939df81517870f0b29a2b40dd9d9.tar.gz rneovim-6871445dfe80939df81517870f0b29a2b40dd9d9.tar.bz2 rneovim-6871445dfe80939df81517870f0b29a2b40dd9d9.zip | |
vim-patch:8.1.1383: warning for size_t/int mixup (#10694)
Problem: Warning for size_t/int mixup.
Solution: Change type. (Mike Williams)
https://github.com/vim/vim/commit/d33a764123a8aedb20cd84aeff3b94810ee67c4c
| -rw-r--r-- | src/nvim/search.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/search.c b/src/nvim/search.c index 85de7f26de..7d46b3b4d5 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -1130,7 +1130,7 @@ int do_search( && !cmd_silent && msg_silent == 0) { char_u *trunc; char_u off_buf[40]; - int off_len = 0; + size_t off_len = 0; // Compute msg_row early. msg_start(); @@ -1170,10 +1170,10 @@ int do_search( len = 0; // adjusted below } else if (msg_scrolled != 0) { // Use all the columns. - len = (int)(Rows - msg_row) * Columns - 1; + len = (Rows - msg_row) * Columns - 1; } else { // Use up to 'showcmd' column. - len = (int)(Rows - msg_row - 1) * Columns + sc_col - 1; + len = (Rows - msg_row - 1) * Columns + sc_col - 1; } if (len < STRLEN(p) + off_len + SEARCH_STAT_BUF_LEN + 3) { len = STRLEN(p) + off_len + SEARCH_STAT_BUF_LEN + 3; @@ -1183,7 +1183,7 @@ int do_search( len = STRLEN(p) + off_len + 3; } - msgbuf = xmalloc((int)len); + msgbuf = xmalloc(len); { memset(msgbuf, ' ', len); msgbuf[0] = dirc; |