diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-01-17 15:54:37 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2019-01-17 16:12:38 +0100 |
| commit | aae82d1a36e01bf7efdaa51ec1c12664fef6db04 (patch) | |
| tree | 648859ad1800ed95cd14fe07c0b51fa376f692bf /src/initctl | |
| parent | 92e31da10065b6eadb06f6f92e386b97a0058f28 (diff) | |
| download | systemd-aae82d1a36e01bf7efdaa51ec1c12664fef6db04.tar.gz | |
initctl: shorten and update code a bit
Diffstat (limited to 'src/initctl')
| -rw-r--r-- | src/initctl/initctl.c | 8 |
1 files changed, 2 insertions, 6 deletions
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) { |