chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reload: implement reload/reexec logic
[elogind.git]
/
initctl.c
diff --git
a/initctl.c
b/initctl.c
index a4356759c2e03fcb1e67c83a9a6599efcb38bb28..96a4d9900396f0ee15775ff4f9854e47c2dbda9d 100644
(file)
--- a/
initctl.c
+++ b/
initctl.c
@@
-246,7
+246,7
@@
static void fifo_free(Fifo *f) {
if (f->server)
epoll_ctl(f->server->epoll_fd, EPOLL_CTL_DEL, f->fd, NULL);
if (f->server)
epoll_ctl(f->server->epoll_fd, EPOLL_CTL_DEL, f->fd, NULL);
-
assert_se(close_nointr(f->fd) == 0
);
+
close_nointr_nofail(f->fd
);
}
free(f);
}
free(f);
@@
-302,7
+302,7
@@
static void server_done(Server *s) {
fifo_free(s->fifos);
if (s->epoll_fd >= 0)
fifo_free(s->fifos);
if (s->epoll_fd >= 0)
-
assert_se(close_nointr(s->epoll_fd) == 0
);
+
close_nointr_nofail(s->epoll_fd
);
if (s->bus)
dbus_connection_unref(s->bus);
if (s->bus)
dbus_connection_unref(s->bus);