picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

udevd: use structured initializer at one more place

This commit is contained in:
Yu Watanabe 2018-12-18 14:50:42 +09:00
parent 1f3f6bd007
commit d40534643b
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/udev/udevd.c
View 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)