From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 19 Dec 2023 03:27:53 +0000 (+0900)
Subject: udev-manager: use ASSERT_PTR()
X-Git-Tag: v256-rc1~1399^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ca31a91deced165e7d1b4e8ce83fd50ac002dd8;p=thirdparty%2Fsystemd.git

udev-manager: use ASSERT_PTR()
---

diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c
index 8077e51055d..859fc024369 100644
--- a/src/udev/udev-manager.c
+++ b/src/udev/udev-manager.c
@@ -333,11 +333,9 @@ static int on_event_timeout_warning(sd_event_source *s, uint64_t usec, void *use
 }
 
 static void worker_attach_event(Worker *worker, Event *event) {
-        Manager *manager;
-        sd_event *e;
+        Manager *manager = ASSERT_PTR(ASSERT_PTR(worker)->manager);
+        sd_event *e = ASSERT_PTR(manager->event);
 
-        assert(worker);
-        assert(worker->manager);
         assert(event);
         assert(!event->worker);
         assert(!worker->event);
@@ -347,9 +345,6 @@ static void worker_attach_event(Worker *worker, Event *event) {
         event->state = EVENT_RUNNING;
         event->worker = worker;
 
-        manager = worker->manager;
-        e = manager->event;
-
         (void) sd_event_add_time_relative(e, &event->timeout_warning_event, CLOCK_MONOTONIC,
                                           udev_warn_timeout(manager->timeout_usec), USEC_PER_SEC,
                                           on_event_timeout_warning, event);