X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Finitctl%2Finitctl.c;h=f9613ea3b1fe282ab2f1f67e85cea28b564d15fc;hp=468df35bac9eef2920a29715324f87ef002f5270;hb=03e334a1c7dc8c20c38902aa039440763acc9b17;hpb=9459781ee66eb57709c8b8701701365ba60a9f1c

diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index 468df35ba..f9613ea3b 100644
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -245,7 +245,7 @@ static void fifo_free(Fifo *f) {
                 if (f->server)
                         epoll_ctl(f->server->epoll_fd, EPOLL_CTL_DEL, f->fd, NULL);
 
-                close_nointr_nofail(f->fd);
+                safe_close(f->fd);
         }
 
         free(f);
@@ -257,8 +257,7 @@ static void server_done(Server *s) {
         while (s->fifos)
                 fifo_free(s->fifos);
 
-        if (s->epoll_fd >= 0)
-                close_nointr_nofail(s->epoll_fd);
+        safe_close(s->epoll_fd);
 
         if (s->bus) {
                 sd_bus_flush(s->bus);