From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 6 Nov 2018 06:55:09 +0000 (+0900)
Subject: udevd: merge conditions to decrease indentation
X-Git-Tag: v240~402^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05e6d9c64be181c2369e6ca68d2b78ca35647042;p=thirdparty%2Fsystemd.git

udevd: merge conditions to decrease indentation
---

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 8bc07050129..0aec3acd07f 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1250,15 +1250,13 @@ static int on_sigchld(sd_event_source *s, const struct signalfd_siginfo *si, voi
                 } else
                         log_warning("worker ["PID_FMT"] exit with status 0x%04x", pid, status);
 
-                if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-                        if (worker->event) {
-                                log_error("worker ["PID_FMT"] failed while handling '%s'", pid, worker->event->devpath);
-                                /* delete state from disk */
-                                udev_device_delete_db(worker->event->dev);
-                                udev_device_tag_index(worker->event->dev, NULL, false);
-                                /* forward kernel event without amending it */
-                                udev_monitor_send_device(manager->monitor, NULL, worker->event->dev_kernel);
-                        }
+                if ((!WIFEXITED(status) || WEXITSTATUS(status) != 0) && worker->event) {
+                        log_error("worker ["PID_FMT"] failed while handling '%s'", pid, worker->event->devpath);
+                        /* delete state from disk */
+                        udev_device_delete_db(worker->event->dev);
+                        udev_device_tag_index(worker->event->dev, NULL, false);
+                        /* forward kernel event without amending it */
+                        udev_monitor_send_device(manager->monitor, NULL, worker->event->dev_kernel);
                 }
 
                 worker_free(worker);