From d40534643b0cc6475813b762ebd573716c4932e3 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 18 Dec 2018 14:50:42 +0900 Subject: [PATCH] udevd: use structured initializer at one more place --- src/udev/udevd.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 33fc0b3c2c..24f4824018 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)