From f594f32c3dab93b2746b3c8547102e7ac1cbf128 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 24 Mar 2025 20:01:48 +0900
Subject: [PATCH 1/2] udev-manager: use notify_start() and notify_on_cleanup()

No functional change. Just refactoring.
---
 src/udev/udev-manager.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c
index adfe8540b2..415112eae4 100644
--- a/src/udev/udev-manager.c
+++ b/src/udev/udev-manager.c
@@ -1373,12 +1373,12 @@ int manager_main(Manager *manager) {
         if (r < 0)
                 log_warning_errno(r, "Failed to apply permissions on static device nodes, ignoring: %m");
 
-        notify_ready(manager);
+        _unused_ _cleanup_(notify_on_cleanup) const char *notify_message =
+                notify_start(NOTIFY_READY, NOTIFY_STOPPING);
 
         r = sd_event_loop(manager->event);
         if (r < 0)
-                log_error_errno(r, "Event loop failed: %m");
+                return log_error_errno(r, "Event loop failed: %m");
 
-        (void) sd_notify(/* unset= */ false, NOTIFY_STOPPING);
-        return r;
+        return 0;
 }

From 2f973db276d38df8a8421969d4a55dd371ed5f9a Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 19 Mar 2025 12:38:57 +0900
Subject: [PATCH 2/2] udev-manager: coding style cleanups

---
 src/udev/udev-manager.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c
index 415112eae4..891a48ad0c 100644
--- a/src/udev/udev-manager.c
+++ b/src/udev/udev-manager.c
@@ -89,7 +89,7 @@ typedef struct Worker {
         Event *event;
 } Worker;
 
-static Event *event_free(Event *event) {
+static Event* event_free(Event *event) {
         if (!event)
                 return NULL;
 
@@ -117,7 +117,7 @@ static void event_queue_cleanup(Manager *manager, EventState match_state) {
         }
 }
 
-static Worker *worker_free(Worker *worker) {
+static Worker* worker_free(Worker *worker) {
         if (!worker)
                 return NULL;
 
@@ -131,7 +131,13 @@ static Worker *worker_free(Worker *worker) {
 }
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Worker*, worker_free);
-DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(worker_hash_op, void, trivial_hash_func, trivial_compare_func, Worker, worker_free);
+DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
+                worker_hash_op,
+                void,
+                trivial_hash_func,
+                trivial_compare_func,
+                Worker,
+                worker_free);
 
 Manager* manager_free(Manager *manager) {
         if (!manager)