From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 2 Oct 2020 07:13:37 +0000 (+0200)
Subject: udev-util: make use of sd-event's NULL callback support
X-Git-Tag: v247-rc1~114^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bac0bfc1d0ee1e57055dffb78c77a1ee021ce536;p=thirdparty%2Fsystemd.git

udev-util: make use of sd-event's NULL callback support
---

diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index 1b5995c130f..b8c5bdc4b8a 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -175,10 +175,6 @@ found:
         return sd_event_exit(sd_device_monitor_get_event(monitor), 0);
 }
 
-static int device_timeout_handler(sd_event_source *s, uint64_t usec, void *userdata) {
-        return sd_event_exit(sd_event_source_get_event(s), -ETIMEDOUT);
-}
-
 static int device_wait_for_initialization_internal(
                 sd_device *_device,
                 const char *devlink,
@@ -248,7 +244,7 @@ static int device_wait_for_initialization_internal(
                 r = sd_event_add_time_relative(
                                 event, &timeout_source,
                                 CLOCK_MONOTONIC, timeout, 0,
-                                device_timeout_handler, NULL);
+                                NULL, INT_TO_PTR(-ETIMEDOUT));
                 if (r < 0)
                         return log_error_errno(r, "Failed to add timeout event source: %m");
         }