tree-wide: make use of TAKE_FD() at two more places

diff --git a/src/core/dbus.c b/src/core/dbus.c
index 4b04498423ac3dec7284ed8d4c180ab69f8e3164..ea77cf83099aea3aadea0c50d9c2e44bfbdefdab 100644 (file)
--- 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 e8ade8b7f7c8e60a688863ee992eaab6f20b109b..9c8b7107d4eac6fc7702dd5ea0d5e9720f6d2eb4 100644 (file)
--- 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) {