Skip to content
Snippets Groups Projects
Commit 30fd3e27 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé
Browse files

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: default avatarDaniel P. Berrange <berrange@redhat.com>
parent de7971ff
No related branches found
No related tags found
No related merge requests found
...@@ -236,8 +236,7 @@ static ssize_t qio_channel_command_readv(QIOChannel *ioc, ...@@ -236,8 +236,7 @@ static ssize_t qio_channel_command_readv(QIOChannel *ioc,
retry: retry:
ret = readv(cioc->readfd, iov, niov); ret = readv(cioc->readfd, iov, niov);
if (ret < 0) { if (ret < 0) {
if (errno == EAGAIN || if (errno == EAGAIN) {
errno == EWOULDBLOCK) {
return QIO_CHANNEL_ERR_BLOCK; return QIO_CHANNEL_ERR_BLOCK;
} }
if (errno == EINTR) { if (errno == EINTR) {
...@@ -265,8 +264,7 @@ static ssize_t qio_channel_command_writev(QIOChannel *ioc, ...@@ -265,8 +264,7 @@ static ssize_t qio_channel_command_writev(QIOChannel *ioc,
retry: retry:
ret = writev(cioc->writefd, iov, niov); ret = writev(cioc->writefd, iov, niov);
if (ret <= 0) { if (ret <= 0) {
if (errno == EAGAIN || if (errno == EAGAIN) {
errno == EWOULDBLOCK) {
return QIO_CHANNEL_ERR_BLOCK; return QIO_CHANNEL_ERR_BLOCK;
} }
if (errno == EINTR) { if (errno == EINTR) {
......
...@@ -96,8 +96,7 @@ static ssize_t qio_channel_file_readv(QIOChannel *ioc, ...@@ -96,8 +96,7 @@ static ssize_t qio_channel_file_readv(QIOChannel *ioc,
retry: retry:
ret = readv(fioc->fd, iov, niov); ret = readv(fioc->fd, iov, niov);
if (ret < 0) { if (ret < 0) {
if (errno == EAGAIN || if (errno == EAGAIN) {
errno == EWOULDBLOCK) {
return QIO_CHANNEL_ERR_BLOCK; return QIO_CHANNEL_ERR_BLOCK;
} }
if (errno == EINTR) { if (errno == EINTR) {
...@@ -125,8 +124,7 @@ static ssize_t qio_channel_file_writev(QIOChannel *ioc, ...@@ -125,8 +124,7 @@ static ssize_t qio_channel_file_writev(QIOChannel *ioc,
retry: retry:
ret = writev(fioc->fd, iov, niov); ret = writev(fioc->fd, iov, niov);
if (ret <= 0) { if (ret <= 0) {
if (errno == EAGAIN || if (errno == EAGAIN) {
errno == EWOULDBLOCK) {
return QIO_CHANNEL_ERR_BLOCK; return QIO_CHANNEL_ERR_BLOCK;
} }
if (errno == EINTR) { if (errno == EINTR) {
......
...@@ -466,8 +466,7 @@ static ssize_t qio_channel_socket_readv(QIOChannel *ioc, ...@@ -466,8 +466,7 @@ static ssize_t qio_channel_socket_readv(QIOChannel *ioc,
retry: retry:
ret = recvmsg(sioc->fd, &msg, sflags); ret = recvmsg(sioc->fd, &msg, sflags);
if (ret < 0) { if (ret < 0) {
if (socket_error() == EAGAIN || if (socket_error() == EAGAIN) {
socket_error() == EWOULDBLOCK) {
return QIO_CHANNEL_ERR_BLOCK; return QIO_CHANNEL_ERR_BLOCK;
} }
if (socket_error() == EINTR) { if (socket_error() == EINTR) {
...@@ -526,8 +525,7 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc, ...@@ -526,8 +525,7 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc,
retry: retry:
ret = sendmsg(sioc->fd, &msg, 0); ret = sendmsg(sioc->fd, &msg, 0);
if (ret <= 0) { if (ret <= 0) {
if (socket_error() == EAGAIN || if (socket_error() == EAGAIN) {
socket_error() == EWOULDBLOCK) {
return QIO_CHANNEL_ERR_BLOCK; return QIO_CHANNEL_ERR_BLOCK;
} }
if (socket_error() == EINTR) { if (socket_error() == EINTR) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment