From 9daec33938676c7439eecefe4c29d0891dd386ba Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 18 Jul 2023 15:55:12 +0900 Subject: udev-util: drop udev_queue_init() from shared It is only used in libudev, let's move it. --- src/libudev/libudev-queue.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/libudev') diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c index 7c5bb5500c..0af99e5481 100644 --- a/src/libudev/libudev-queue.c +++ b/src/libudev/libudev-queue.c @@ -192,18 +192,21 @@ _public_ struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_qu * Returns: a file descriptor to watch for a queue to become empty. */ _public_ int udev_queue_get_fd(struct udev_queue *udev_queue) { - int r; + _cleanup_close_ int fd = -EBADF; assert_return(udev_queue, -EINVAL); if (udev_queue->fd >= 0) return udev_queue->fd; - r = udev_queue_init(); - if (r < 0) - return r; + fd = inotify_init1(IN_CLOEXEC); + if (fd < 0) + return -errno; + + if (inotify_add_watch(fd, "/run/udev" , IN_DELETE) < 0) + return -errno; - return udev_queue->fd = r; + return udev_queue->fd = TAKE_FD(fd); } /** -- cgit v1.2.3