From 67825de267b8456ec0c458652fc9730d3953c20e Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 27 May 2024 12:12:50 +0900 Subject: [PATCH] sd-device-monitor: remove device_monitor_disconnect() It is not necessary to be exposed anymore. --- src/libsystemd/sd-device/device-monitor-private.h | 1 - src/libsystemd/sd-device/device-monitor.c | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/libsystemd/sd-device/device-monitor-private.h b/src/libsystemd/sd-device/device-monitor-private.h index e37b36a8d33..6cd2fef3ca1 100644 --- a/src/libsystemd/sd-device/device-monitor-private.h +++ b/src/libsystemd/sd-device/device-monitor-private.h @@ -16,7 +16,6 @@ typedef enum MonitorNetlinkGroup { } MonitorNetlinkGroup; int device_monitor_new_full(sd_device_monitor **ret, MonitorNetlinkGroup group, int fd); -int device_monitor_disconnect(sd_device_monitor *m); int device_monitor_get_address(sd_device_monitor *m, union sockaddr_union *ret); int device_monitor_allow_unicast_sender(sd_device_monitor *m, sd_device_monitor *sender); int device_monitor_get_fd(sd_device_monitor *m); diff --git a/src/libsystemd/sd-device/device-monitor.c b/src/libsystemd/sd-device/device-monitor.c index c4113ae1b5f..474b1b603d7 100644 --- a/src/libsystemd/sd-device/device-monitor.c +++ b/src/libsystemd/sd-device/device-monitor.c @@ -125,13 +125,6 @@ _public_ int sd_device_monitor_set_receive_buffer_size(sd_device_monitor *m, siz return fd_set_rcvbuf(m->sock, size, false); } -int device_monitor_disconnect(sd_device_monitor *m) { - assert(m); - - m->sock = safe_close(m->sock); - return 0; -} - int device_monitor_get_fd(sd_device_monitor *m) { assert(m); @@ -442,7 +435,7 @@ static sd_device_monitor *device_monitor_free(sd_device_monitor *m) { assert(m); (void) sd_device_monitor_detach_event(m); - (void) device_monitor_disconnect(m); + m->sock = safe_close(m->sock); uid_range_free(m->mapped_userns_uid_range); free(m->description); -- 2.47.3