SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

journal-remote: stop using EWOULDBLOCK

Browse Source 
There is no reason to ever use EWOULDBLOCK. It's equivalent to EAGAIN on
all architectures on linux.
This commit is contained in:
David Herrmann
2015-03-13 14:10:35 +01:00
parent ca2031fcc8
commit ff55c3c732
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal-remote/journal-remote-parse.c
+4 -4
View File
@@ -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;
src/journal-remote/journal-remote.c
+2 -2
View File
@@ -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");