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

udev: use structured initializer at one more place

This commit is contained in:
Yu Watanabe 2018-10-25 18:18:35 +09:00
parent c4b69e990f
commit 6f19b42f24
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/udev/udevd.c
View File

@ -1552,13 +1552,15 @@ static int manager_new(Manager **ret, int fd_ctrl, int fd_uevent, const char *cg
assert(ret);
manager = new0(Manager, 1);
manager = new(Manager, 1);
if (!manager)
return log_oom();
manager->fd_inotify = -1;
manager->worker_watch[WRITE_END] = -1;
manager->worker_watch[READ_END] = -1;
*manager = (Manager) {
.fd_inotify = -1,
.worker_watch = { -1, -1 },
.cgroup = cgroup,
};
udev_builtin_init();
@ -1566,10 +1568,6 @@ static int manager_new(Manager **ret, int fd_ctrl, int fd_uevent, const char *cg
if (!manager->rules)
return log_error_errno(ENOMEM, "error reading rules");
LIST_HEAD_INIT(manager->events);
manager->cgroup = cgroup;
manager->ctrl = udev_ctrl_new_from_fd(fd_ctrl);
if (!manager->ctrl)
return log_error_errno(EINVAL, "error taking over udev control socket");