Mercurial > vim
changeset 8072:38887bf423ba v7.4.1330
commit https://github.com/vim/vim/commit/0943a09db84b036ec550d7f2e5b832f621b400ca
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Feb 16 13:11:17 2016 +0100
patch 7.4.1330
Problem: fd_read() has an unused argument.
Solution: Remove the timeout. (Yasuhiro Matsumoto)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 16 Feb 2016 13:15:04 +0100 |
| parents | a4cd495eb365 |
| children | 42db5fe07958 |
| files | src/channel.c src/version.c |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -47,7 +47,7 @@ # define sock_write(sd, buf, len) write(sd, buf, len) # define sock_read(sd, buf, len) read(sd, buf, len) # define sock_close(sd) close(sd) -# define fd_read(fd, buf, len, timeout) read(fd, buf, len) +# define fd_read(fd, buf, len) read(fd, buf, len) # define fd_write(sd, buf, len) write(sd, buf, len) # define fd_close(sd) close(sd) #endif @@ -58,7 +58,7 @@ extern HWND s_hwnd; /* Gvim's Window h #ifdef WIN32 static int -fd_read(sock_T fd, char_u *buf, size_t len, int timeout) +fd_read(sock_T fd, char_u *buf, size_t len) { HANDLE h = (HANDLE)fd; DWORD nread; @@ -1504,7 +1504,7 @@ channel_read(channel_T *channel, int whi if (use_socket) len = sock_read(fd, buf, MAXMSGSIZE); else - len = fd_read(fd, buf, MAXMSGSIZE, channel->ch_timeout); + len = fd_read(fd, buf, MAXMSGSIZE); if (len <= 0) break; /* error or nothing more to read */