From ba47b71c2dadf5c8301b775b0ef0ae97545520f4 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 8 Nov 2018 17:45:01 +0900 Subject: [PATCH] udevd: decrease indentation --- src/udev/udevd.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 58e3011fa39..49842b60a9e 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -147,10 +147,9 @@ struct worker_message { }; static void event_free(struct event *event) { - int r; - if (!event) return; + assert(event->manager); LIST_REMOVE(event, event->manager->events, event); @@ -163,14 +162,11 @@ static void event_free(struct event *event) { if (event->worker) event->worker->event = NULL; - if (LIST_IS_EMPTY(event->manager->events)) { - /* only clean up the queue from the process that created it */ - if (event->manager->pid == getpid_cached()) { - r = unlink("/run/udev/queue"); - if (r < 0) - log_warning_errno(errno, "could not unlink /run/udev/queue: %m"); - } - } + /* only clean up the queue from the process that created it */ + if (LIST_IS_EMPTY(event->manager->events) && + event->manager->pid == getpid_cached()) + if (unlink("/run/udev/queue") < 0) + log_warning_errno(errno, "Failed to unlink /run/udev/queue: %m"); free(event); } -- 2.47.3