From: Gerald Pfeifer gerald@pfeifer.com
find_device_from_devnode was unnecessarily guarded by HAVE_SYS_INOTIFY_H, alas its use in process_monitor_event was not, so linking failed. Simply make find_device_from_devnode generally available.
On the way reduce the scope of a variable. --- dlls/winebus.sys/bus_udev.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 71b9ef84530..602591e6bc8 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -260,6 +260,16 @@ static struct base_device *find_device_from_fd(int fd) return NULL; }
+static struct base_device *find_device_from_devnode(const char *path) +{ + struct base_device *impl; + + LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) + if (!strcmp(impl->devnode, path)) return impl; + + return NULL; +} + static void hidraw_device_destroy(struct unix_device *iface) { struct hidraw_device *impl = hidraw_impl_from_unix_device(iface); @@ -1546,16 +1556,6 @@ static int create_inotify(void) return fd; }
-static struct base_device *find_device_from_devnode(const char *path) -{ - struct base_device *impl; - - LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) - if (!strcmp(impl->devnode, path)) return impl; - - return NULL; -} - static void maybe_remove_devnode(const char *base, const char *dir) { struct base_device *impl; @@ -1714,7 +1714,6 @@ error:
static void process_monitor_event(struct udev_monitor *monitor) { - struct base_device *impl; struct udev_device *dev; const char *action;
@@ -1735,6 +1734,8 @@ static void process_monitor_event(struct udev_monitor *monitor) udev_add_device(dev, -1); else { + struct base_device *impl; + impl = find_device_from_devnode(udev_device_get_devnode(dev)); if (impl) bus_event_queue_device_removed(&event_queue, &impl->unix_device); else WARN("failed to find device for udev device %p\n", dev);