sd-{login,netlink,network}: use TAKE_FD() in more places

diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
index d8baa6f8af527900b4e658cde67e390885fcebe7..939b2a5df42ce70161290f70b3b725b4637390a5 100644 (file)
--- a/src/libsystemd/sd-login/sd-login.c
+++ b/src/libsystemd/sd-login/sd-login.c
@@ -997,20 +997,13 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
         if (!good)
                 return -EINVAL;
 
-        *m = FD_TO_MONITOR(fd);
-        fd = -1;
-
+        *m = FD_TO_MONITOR(TAKE_FD(fd));
         return 0;
 }
 
 _public_ sd_login_monitor* sd_login_monitor_unref(sd_login_monitor *m) {
-        int fd;
-
-        if (!m)
-                return NULL;
-
-        fd = MONITOR_TO_FD(m);
-        close_nointr(fd);
+        if (m)
+                close_nointr(MONITOR_TO_FD(m));
 
         return NULL;
 }

diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c
index ff0886d40b83df8d84b3c166613c868e8ea8103d..6f283e31ff74828134578396141cae4ffb3fffab 100644 (file)
--- a/src/libsystemd/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/sd-netlink/sd-netlink.c
@@ -135,8 +135,7 @@ int netlink_open_family(sd_netlink **ret, int family) {
         r = sd_netlink_open_fd(ret, fd);
         if (r < 0)
                 return r;
-
-        fd = -1;
+        TAKE_FD(fd);
 
         return 0;
 }

diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index ce6ae846c5041e828cd2ef0a4cb85af53e755a65..832ec1703e9be0a5821dcbaeb88c4837cc25052b 100644 (file)
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -373,19 +373,13 @@ _public_ int sd_network_monitor_new(sd_network_monitor **m, const char *category
         if (!good)
                 return -EINVAL;
 
-        *m = FD_TO_MONITOR(fd);
-        fd = -1;
-
+        *m = FD_TO_MONITOR(TAKE_FD(fd));
         return 0;
 }
 
 _public_ sd_network_monitor* sd_network_monitor_unref(sd_network_monitor *m) {
-        int fd;
-
-        if (m) {
-                fd = MONITOR_TO_FD(m);
-                close_nointr(fd);
-        }
+        if (m)
+                close_nointr(MONITOR_TO_FD(m));
 
         return NULL;
 }