From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 28 Aug 2018 04:06:02 +0000 (+0900)
Subject: libudev-monitor: use safe_close() in udev_monitor_disconnect()
X-Git-Tag: v240~720^2~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50d2158901fcc7207be1a50643772a8ba229742c;p=thirdparty%2Fsystemd.git

libudev-monitor: use safe_close() in udev_monitor_disconnect()
---

diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index f0b5081392c..fe4595930f4 100644
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -425,13 +425,11 @@ _public_ int udev_monitor_set_receive_buffer_size(struct udev_monitor *udev_moni
         return 0;
 }
 
-int udev_monitor_disconnect(struct udev_monitor *udev_monitor)
-{
-        int err;
+int udev_monitor_disconnect(struct udev_monitor *udev_monitor) {
+        assert(udev_monitor);
 
-        err = close(udev_monitor->sock);
-        udev_monitor->sock = -1;
-        return err < 0 ? -errno : 0;
+        udev_monitor->sock = safe_close(udev_monitor->sock);
+        return 0;
 }
 
 /**