thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1330

Browse Source 
Problem:    fd_read() has an unused argument.
Solution:   Remove the timeout. (Yasuhiro Matsumoto)
This commit is contained in:
Bram Moolenaar
2016-02-16 13:11:17 +01:00
parent 5cefd40982
commit 0943a09db8
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/channel.c
View File

@@ -47,7 +47,7 @@
# define sock_write(sd, buf, len) write(sd, buf, len) # define sock_write(sd, buf, len) write(sd, buf, len)
# define sock_read(sd, buf, len) read(sd, buf, len) # define sock_read(sd, buf, len) read(sd, buf, len)
# define sock_close(sd) close(sd) # 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_write(sd, buf, len) write(sd, buf, len)
# define fd_close(sd) close(sd) # define fd_close(sd) close(sd)
#endif #endif
@@ -58,7 +58,7 @@ extern HWND s_hwnd; /* Gvim's Window handle */
#ifdef WIN32 #ifdef WIN32
static int 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; HANDLE h = (HANDLE)fd;
DWORD nread; DWORD nread;
@@ -1504,7 +1504,7 @@ channel_read(channel_T *channel, int which, char *func)
if (use_socket) if (use_socket)
len = sock_read(fd, buf, MAXMSGSIZE); len = sock_read(fd, buf, MAXMSGSIZE);
else else
len = fd_read(fd, buf, MAXMSGSIZE, channel->ch_timeout); len = fd_read(fd, buf, MAXMSGSIZE);
if (len <= 0) if (len <= 0)
break; /* error or nothing more to read */ break; /* error or nothing more to read */

2
src/version.c
View File

@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1330,
/**/ /**/
1329, 1329,
/**/ /**/