From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 15 Oct 2018 10:09:17 +0000 (+0200)
Subject: tree-wide: make use of TAKE_FD() at two more places
X-Git-Tag: v240~538^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b7e8b322de1673a29a1c3a53bf9ac1f8afe1613;p=thirdparty%2Fsystemd.git

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

diff --git a/src/core/dbus.c b/src/core/dbus.c
index 4b04498423a..ea77cf83099 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 e8ade8b7f7c..9c8b7107d4e 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) {