summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-04-07 18:47:35 +0200
committerLennart Poettering <lennart@poettering.net>2015-04-07 18:51:45 +0200
commite5403f09aa0c548d2739f132c2699a6ad44dad51 (patch)
tree920054fa4221066bec71667d72c9ab837d2a3d87
parent5bdf22430e367799dfa66c724144b624c5479518 (diff)
socket: minor modernizations
-rw-r--r--src/core/socket.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/socket.c b/src/core/socket.c
index f67370b4cb..c81fd66eef 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -2315,8 +2315,7 @@ static int socket_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
if (errno == EINTR)
continue;
- log_unit_error(UNIT(p->socket)->id,
- "Failed to accept socket: %m");
+ log_unit_error(UNIT(p->socket)->id, "Failed to accept socket: %m");
goto fail;
}
@@ -2523,7 +2522,8 @@ int socket_collect_fds(Socket *s, int **fds, unsigned *n_fds) {
return 0;
}
- if (!(rfds = new(int, rn_fds)))
+ rfds = new(int, rn_fds);
+ if (!rfds)
return -ENOMEM;
k = 0;