summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-11-10 10:44:53 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-11-10 14:19:20 +0100
commit55c540d39fd2a7741be1c14e34a5f09302392168 (patch)
tree9a937423ffdbc329b13a13ffc72fe247853a7d6a
parentac9f2640cb9c107b43f47bba7e068d3b92b5337b (diff)
downloadsystemd-55c540d39fd2a7741be1c14e34a5f09302392168.tar.gz
sd-event: minor modernization
With this change the pattern used for epoll_ctl() is the same in all calls in this file. Consistency FTW!
-rw-r--r--src/libsystemd/sd-event/sd-event.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 0d3d81959c..7a3f89ed37 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -402,8 +402,7 @@ static int source_io_register(
if (epoll_ctl(s->event->epoll_fd,
s->io.registered ? EPOLL_CTL_MOD : EPOLL_CTL_ADD,
- s->io.fd,
- &ev) < 0)
+ s->io.fd, &ev) < 0)
return -errno;
s->io.registered = true;
@@ -430,8 +429,6 @@ static void source_child_pidfd_unregister(sd_event_source *s) {
}
static int source_child_pidfd_register(sd_event_source *s, int enabled) {
- int r;
-
assert(s);
assert(s->type == SOURCE_CHILD);
assert(enabled != SD_EVENT_OFF);
@@ -442,11 +439,9 @@ static int source_child_pidfd_register(sd_event_source *s, int enabled) {
.data.ptr = s,
};
- if (s->child.registered)
- r = epoll_ctl(s->event->epoll_fd, EPOLL_CTL_MOD, s->child.pidfd, &ev);
- else
- r = epoll_ctl(s->event->epoll_fd, EPOLL_CTL_ADD, s->child.pidfd, &ev);
- if (r < 0)
+ if (epoll_ctl(s->event->epoll_fd,
+ s->child.registered ? EPOLL_CTL_MOD : EPOLL_CTL_ADD,
+ s->child.pidfd, &ev) < 0)
return -errno;
}