From 0b7e8b322de1673a29a1c3a53bf9ac1f8afe1613 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 15 Oct 2018 12:09:17 +0200 Subject: [PATCH] tree-wide: make use of TAKE_FD() at two more places --- src/core/dbus.c | 3 +-- src/core/manager.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/core/dbus.c b/src/core/dbus.c index 4b04498423..ea77cf8309 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -1035,9 +1035,8 @@ int bus_init_private(Manager *m) { (void) sd_event_source_set_description(s, "bus-connection"); - m->private_listen_fd = fd; + m->private_listen_fd = TAKE_FD(fd); m->private_listen_event_source = s; - fd = -1; log_debug("Successfully created private D-Bus server."); diff --git a/src/core/manager.c b/src/core/manager.c index e8ade8b7f7..9c8b7107d4 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -978,8 +978,7 @@ static int manager_setup_cgroups_agent(Manager *m) { if (r < 0) return log_error_errno(errno, "bind(%s) failed: %m", sa.un.sun_path); - m->cgroups_agent_fd = fd; - fd = -1; + m->cgroups_agent_fd = TAKE_FD(fd); } if (!m->cgroups_agent_event_source) {