diff --git a/init/epoll.cpp b/init/epoll.cpp index dc2104313..3a830ce25 100644 --- a/init/epoll.cpp +++ b/init/epoll.cpp @@ -45,16 +45,18 @@ Result Epoll::RegisterHandler(int fd, Handler handler, uint32_t events) { return Error() << "Must specify events"; } - Info info; - info.events = events; - info.handler = std::make_shared(std::move(handler)); - auto [it, inserted] = epoll_handlers_.emplace(fd, std::move(info)); + auto [it, inserted] = epoll_handlers_.emplace( + fd, Info{ + .events = events, + .handler = std::make_shared(std::move(handler)), + }); if (!inserted) { return Error() << "Cannot specify two epoll handlers for a given FD"; } - epoll_event ev; - ev.events = events; - ev.data.fd = fd; + epoll_event ev = { + .events = events, + .data.fd = fd, + }; if (epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, fd, &ev) == -1) { Result result = ErrnoError() << "epoll_ctl failed to add fd"; epoll_handlers_.erase(fd);