From 6f19b42f24b7aea227094c6d06b1cef8053ce8cb Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 25 Oct 2018 18:18:35 +0900 Subject: [PATCH] udev: use structured initializer at one more place --- src/udev/udevd.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 922542f..05030dc 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -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"); -- 2.7.4