From aae82d1a36e01bf7efdaa51ec1c12664fef6db04 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 17 Jan 2019 15:54:37 +0100 Subject: initctl: shorten and update code a bit --- src/initctl/initctl.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/initctl') diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c index c60d4bd740..260dc2eb61 100644 --- a/src/initctl/initctl.c +++ b/src/initctl/initctl.c @@ -233,12 +233,8 @@ static void server_done(Server *s) { while (s->fifos) fifo_free(s->fifos); - safe_close(s->epoll_fd); - - if (s->bus) { - sd_bus_flush(s->bus); - sd_bus_unref(s->bus); - } + s->epoll_fd = safe_close(s->epoll_fd); + s->bus = sd_bus_flush_close_unref(s->bus); } static int server_init(Server *s, unsigned n_sockets) { -- cgit v1.2.1