From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 18 Dec 2018 05:50:42 +0000 (+0900)
Subject: udevd: use structured initializer at one more place
X-Git-Tag: v241-rc1~84^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d40534643b0cc6475813b762ebd573716c4932e3;p=thirdparty%2Fsystemd.git

udevd: use structured initializer at one more place
---

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 33fc0b3c2cd..24f4824018c 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -209,15 +209,18 @@ static int worker_new(struct worker **ret, Manager *manager, sd_device_monitor *
         assert(worker_monitor);
         assert(pid > 1);
 
-        worker = new0(struct worker, 1);
+        /* close monitor, but keep address around */
+        device_monitor_disconnect(worker_monitor);
+
+        worker = new(struct worker, 1);
         if (!worker)
                 return -ENOMEM;
 
-        worker->manager = manager;
-        /* close monitor, but keep address around */
-        device_monitor_disconnect(worker_monitor);
-        worker->monitor = sd_device_monitor_ref(worker_monitor);
-        worker->pid = pid;
+        *worker = (struct worker) {
+                .manager = manager,
+                .monitor = sd_device_monitor_ref(worker_monitor),
+                .pid = pid,
+        };
 
         r = hashmap_ensure_allocated(&manager->workers, NULL);
         if (r < 0)