]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udevd: use structured initializer at one more place
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 18 Dec 2018 05:50:42 +0000 (14:50 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 12 Jan 2019 00:32:20 +0000 (09:32 +0900)
src/udev/udevd.c

index 33fc0b3c2cd72582622a17dc60cff0dfb9d05db0..24f4824018c0c524248d86a910b2840bd7e5148b 100644 (file)
@@ -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)