Skip to content

Commit 0943a09

Browse files
committed
patch 7.4.1330
Problem: fd_read() has an unused argument. Solution: Remove the timeout. (Yasuhiro Matsumoto)
1 parent 5cefd40 commit 0943a09

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/channel.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
# define sock_write(sd, buf, len) write(sd, buf, len)
4848
# define sock_read(sd, buf, len) read(sd, buf, len)
4949
# define sock_close(sd) close(sd)
50-
# define fd_read(fd, buf, len, timeout) read(fd, buf, len)
50+
# define fd_read(fd, buf, len) read(fd, buf, len)
5151
# define fd_write(sd, buf, len) write(sd, buf, len)
5252
# define fd_close(sd) close(sd)
5353
#endif
@@ -58,7 +58,7 @@ extern HWND s_hwnd; /* Gvim's Window handle */
5858

5959
#ifdef WIN32
6060
static int
61-
fd_read(sock_T fd, char_u *buf, size_t len, int timeout)
61+
fd_read(sock_T fd, char_u *buf, size_t len)
6262
{
6363
HANDLE h = (HANDLE)fd;
6464
DWORD nread;
@@ -1504,7 +1504,7 @@ channel_read(channel_T *channel, int which, char *func)
15041504
if (use_socket)
15051505
len = sock_read(fd, buf, MAXMSGSIZE);
15061506
else
1507-
len = fd_read(fd, buf, MAXMSGSIZE, channel->ch_timeout);
1507+
len = fd_read(fd, buf, MAXMSGSIZE);
15081508
if (len <= 0)
15091509
break; /* error or nothing more to read */
15101510

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,8 @@ static char *(features[]) =
747747

748748
static int included_patches[] =
749749
{ /* Add new patch number below this line */
750+
/**/
751+
1330,
750752
/**/
751753
1329,
752754
/**/

0 commit comments

Comments
 (0)