]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udev: use structured initializer at one more place 10603/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 25 Oct 2018 09:18:35 +0000 (18:18 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 12 Nov 2018 14:25:59 +0000 (23:25 +0900)
src/udev/udevd.c

index 922542f0f613d51aa205f02f2b28299bfbd908d8..05030dc81e6eab866141bb4c7d1c9f8ed3d7fe9a 100644 (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");