diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2016-03-10 17:17:33 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2016-03-10 17:19:05 +0000 |
| commit | 30fd3e27907dfd1c0c66cc1339657af1a2ce1d4b (patch) | |
| tree | 9d6ccce92091795214ef99981e31dd6ca0a00224 | |
| parent | de7971ffb9a1ac85cbcc12f5380f44d31ed182e6 (diff) | |
io: remove checking of EWOULDBLOCK
Since we now canonicalize WSAEWOULDBLOCK into EAGAIN there is
no longer any need to explicitly check EWOULDBLOCK for Win32.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
| -rw-r--r-- | io/channel-command.c | 6 | ||||
| -rw-r--r-- | io/channel-file.c | 6 | ||||
| -rw-r--r-- | io/channel-socket.c | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/io/channel-command.c b/io/channel-command.c index f53ce0f4f4..604514adfc 100644 --- a/io/channel-command.c +++ b/io/channel-command.c @@ -236,8 +236,7 @@ static ssize_t qio_channel_command_readv(QIOChannel *ioc, retry: ret = readv(cioc->readfd, iov, niov); if (ret < 0) { - if (errno == EAGAIN || - errno == EWOULDBLOCK) { + if (errno == EAGAIN) { return QIO_CHANNEL_ERR_BLOCK; } if (errno == EINTR) { @@ -265,8 +264,7 @@ static ssize_t qio_channel_command_writev(QIOChannel *ioc, retry: ret = writev(cioc->writefd, iov, niov); if (ret <= 0) { - if (errno == EAGAIN || - errno == EWOULDBLOCK) { + if (errno == EAGAIN) { return QIO_CHANNEL_ERR_BLOCK; } if (errno == EINTR) { diff --git a/io/channel-file.c b/io/channel-file.c index 19a432562a..f28e2b0a5c 100644 --- a/io/channel-file.c +++ b/io/channel-file.c @@ -96,8 +96,7 @@ static ssize_t qio_channel_file_readv(QIOChannel *ioc, retry: ret = readv(fioc->fd, iov, niov); if (ret < 0) { - if (errno == EAGAIN || - errno == EWOULDBLOCK) { + if (errno == EAGAIN) { return QIO_CHANNEL_ERR_BLOCK; } if (errno == EINTR) { @@ -125,8 +124,7 @@ static ssize_t qio_channel_file_writev(QIOChannel *ioc, retry: ret = writev(fioc->fd, iov, niov); if (ret <= 0) { - if (errno == EAGAIN || - errno == EWOULDBLOCK) { + if (errno == EAGAIN) { return QIO_CHANNEL_ERR_BLOCK; } if (errno == EINTR) { diff --git a/io/channel-socket.c b/io/channel-socket.c index 9b5f2d8887..2387d97d7c 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -466,8 +466,7 @@ static ssize_t qio_channel_socket_readv(QIOChannel *ioc, retry: ret = recvmsg(sioc->fd, &msg, sflags); if (ret < 0) { - if (socket_error() == EAGAIN || - socket_error() == EWOULDBLOCK) { + if (socket_error() == EAGAIN) { return QIO_CHANNEL_ERR_BLOCK; } if (socket_error() == EINTR) { @@ -526,8 +525,7 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc, retry: ret = sendmsg(sioc->fd, &msg, 0); if (ret <= 0) { - if (socket_error() == EAGAIN || - socket_error() == EWOULDBLOCK) { + if (socket_error() == EAGAIN) { return QIO_CHANNEL_ERR_BLOCK; } if (socket_error() == EINTR) { |