summaryrefslogtreecommitdiff
path: root/src/initctl
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-09-08 19:14:10 +0200
committerLennart Poettering <lennart@poettering.net>2015-09-09 08:20:20 +0200
commit3cc2aff1abff9e34f9fec282d970204dc1eab6f1 (patch)
tree39d4b5f8f9980aeacaf64b4c3078f51a46a3b63e /src/initctl
parent7f6e12b03300ba3e473ce6b85d823fc0375b335e (diff)
downloadsystemd-3cc2aff1abff9e34f9fec282d970204dc1eab6f1.tar.gz
tree-wide: don't do assignments within if checks
Turn this: if ((r = foo()) < 0) { ... into this: r = foo(); if (r < 0) { ...
Diffstat (limited to 'src/initctl')
-rw-r--r--src/initctl/initctl.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index 19d6468fcc..087cc2f7d6 100644
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -399,13 +399,10 @@ int main(int argc, char *argv[]) {
struct epoll_event event;
int k;
- if ((k = epoll_wait(server.epoll_fd,
- &event, 1,
- TIMEOUT_MSEC)) < 0) {
-
+ k = epoll_wait(server.epoll_fd, &event, 1, TIMEOUT_MSEC);
+ if (k < 0) {
if (errno == EINTR)
continue;
-
log_error_errno(errno, "epoll_wait() failed: %m");
goto fail;
}