chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-event: make errors on EPOLL_CTL_DEL pseudo-fatal
[elogind.git]
/
src
/
libelogind
/
sd-event
/
sd-event.c
diff --git
a/src/libelogind/sd-event/sd-event.c
b/src/libelogind/sd-event/sd-event.c
index 00880c983b543a563c0388d5346bbe73197d0a3d..76964aa0ccd71ac0aecdd4d19d38d076e5a75f0c 100644
(file)
--- a/
src/libelogind/sd-event/sd-event.c
+++ b/
src/libelogind/sd-event/sd-event.c
@@
-468,24
+468,22
@@
static bool event_pid_changed(sd_event *e) {
return e->original_pid != getpid();
}
return e->original_pid != getpid();
}
-static
int
source_io_unregister(sd_event_source *s) {
+static
void
source_io_unregister(sd_event_source *s) {
int r;
assert(s);
assert(s->type == SOURCE_IO);
if (event_pid_changed(s->event))
int r;
assert(s);
assert(s->type == SOURCE_IO);
if (event_pid_changed(s->event))
- return
0
;
+ return;
if (!s->io.registered)
if (!s->io.registered)
- return
0
;
+ return;
r = epoll_ctl(s->event->epoll_fd, EPOLL_CTL_DEL, s->io.fd, NULL);
r = epoll_ctl(s->event->epoll_fd, EPOLL_CTL_DEL, s->io.fd, NULL);
- if (r < 0)
- return -errno;
+ assert_log(r >= 0);
s->io.registered = false;
s->io.registered = false;
- return 0;
}
static int source_io_register(
}
static int source_io_register(
@@
-1457,10
+1455,7
@@
_public_ int sd_event_source_set_enabled(sd_event_source *s, int m) {
switch (s->type) {
case SOURCE_IO:
switch (s->type) {
case SOURCE_IO:
- r = source_io_unregister(s);
- if (r < 0)
- return r;
-
+ source_io_unregister(s);
s->enabled = m;
break;
s->enabled = m;
break;