From ff55c3c7327e6ad8ab139aef52d498386d4f4a72 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Fri, 13 Mar 2015 13:51:55 +0100 Subject: journal-remote: stop using EWOULDBLOCK There is no reason to ever use EWOULDBLOCK. It's equivalent to EAGAIN on all architectures on linux. --- src/journal-remote/journal-remote-parse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/journal-remote/journal-remote-parse.c') diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c index 7e62954351..e08cbcc341 100644 --- a/src/journal-remote/journal-remote-parse.c +++ b/src/journal-remote/journal-remote-parse.c @@ -112,7 +112,7 @@ static int get_line(RemoteSource *source, char **line, size_t *size) { if (source->passive_fd) /* we have to wait for some data to come to us */ - return -EWOULDBLOCK; + return -EAGAIN; if (source->size - source->filled < LINE_CHUNK && !realloc_buffer(source, @@ -125,7 +125,7 @@ static int get_line(RemoteSource *source, char **line, size_t *size) { n = read(source->fd, source->buf + source->filled, source->size - source->filled); if (n < 0) { - if (errno != EAGAIN && errno != EWOULDBLOCK) + if (errno != EAGAIN) log_error_errno(errno, "read(%d, ..., %zu): %m", source->fd, source->size - source->filled); return -errno; @@ -178,7 +178,7 @@ static int fill_fixed_size(RemoteSource *source, void **data, size_t size) { if (source->passive_fd) /* we have to wait for some data to come to us */ - return -EWOULDBLOCK; + return -EAGAIN; if (!realloc_buffer(source, source->offset + size)) return log_oom(); @@ -186,7 +186,7 @@ static int fill_fixed_size(RemoteSource *source, void **data, size_t size) { n = read(source->fd, source->buf + source->filled, source->size - source->filled); if (n < 0) { - if (errno != EAGAIN && errno != EWOULDBLOCK) + if (errno != EAGAIN) log_error_errno(errno, "read(%d, ..., %zu): %m", source->fd, source->size - source->filled); return -errno; -- cgit v1.2.3-54-g00ecf