diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2015-03-13 13:51:55 +0100 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2015-03-13 14:10:35 +0100 |
| commit | ff55c3c7327e6ad8ab139aef52d498386d4f4a72 (patch) | |
| tree | 8c16231d56fd1ef483cec9cc1cbc405e0d81843d /src/journal-remote | |
| parent | ca2031fcc863fcdd4dd1594709918cb60cfd0e1b (diff) | |
| download | systemd-ff55c3c7327e6ad8ab139aef52d498386d4f4a72.tar.gz systemd-ff55c3c7327e6ad8ab139aef52d498386d4f4a72.tar.bz2 systemd-ff55c3c7327e6ad8ab139aef52d498386d4f4a72.zip | |
journal-remote: stop using EWOULDBLOCK
There is no reason to ever use EWOULDBLOCK. It's equivalent to EAGAIN on
all architectures on linux.
Diffstat (limited to 'src/journal-remote')
| -rw-r--r-- | src/journal-remote/journal-remote-parse.c | 8 | ||||
| -rw-r--r-- | src/journal-remote/journal-remote.c | 4 |
2 files changed, 6 insertions, 6 deletions
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; diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 1a2c1368a3..64498ddda3 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -516,7 +516,7 @@ static int process_http_upload( while (true) { r = process_source(source, arg_compress, arg_seal); - if (r == -EAGAIN || r == -EWOULDBLOCK) + if (r == -EAGAIN) break; else if (r < 0) { log_warning("Failed to process data for connection %p", connection); @@ -1034,7 +1034,7 @@ static int handle_raw_source(sd_event_source *event, } else if (r == -E2BIG) { log_notice_errno(E2BIG, "Entry too big, skipped"); return 1; - } else if (r == -EAGAIN || r == -EWOULDBLOCK) { + } else if (r == -EAGAIN) { return 0; } else if (r < 0) { log_debug_errno(r, "Closing connection: %m"); |