From 28235d1062f0a344b342979a0a6be06712bfa67f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 26 Oct 2022 04:52:06 +0900 Subject: [PATCH] udev: use ASSERT_PTR() at one more place --- src/udev/udev-event.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index 42b480ca6b1..454139c8820 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -1038,11 +1038,9 @@ int udev_event_execute_rules( sd_device *dev; int r; - assert(event); + dev = ASSERT_PTR(ASSERT_PTR(event)->dev); assert(rules); - dev = event->dev; - r = sd_device_get_action(dev, &action); if (r < 0) return log_device_error_errno(dev, r, "Failed to get ACTION: %m"); @@ -1051,7 +1049,7 @@ int udev_event_execute_rules( return event_execute_rules_on_remove(event, inotify_fd, timeout_usec, timeout_signal, properties_list, rules); /* Disable watch during event processing. */ - r = udev_watch_end(inotify_fd, event->dev); + r = udev_watch_end(inotify_fd, dev); if (r < 0) log_device_warning_errno(dev, r, "Failed to remove inotify watch, ignoring: %m"); -- 2.47.3