]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udevd: merge conditions to decrease indentation
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 6 Nov 2018 06:55:09 +0000 (15:55 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 6 Nov 2018 14:21:25 +0000 (23:21 +0900)
src/udev/udevd.c

index 8bc070501294ac62dbd6d4b9fd48a990e78a8faf..0aec3acd07fdb9940eee9548133fd6e089f630bd 100644 (file)
@@ -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);