From 4842650043b67bcdf3ff7fd6e1dc9691b46aa41b Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 17 Oct 2022 10:28:46 -0700 Subject: [PATCH] init: Improve readability of the code in SecondStageMain() Change the type of epoll_timeout from std::optional into std::chrono::milliseconds. No functionality is changed. Bug: 213617178 Change-Id: Ieb150e0aeabdb79c8da4649875ea3ed59297343b Signed-off-by: Bart Van Assche --- init/init.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init/init.cpp b/init/init.cpp index cd0ee58ec..f9e7c6ea1 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -1148,7 +1148,7 @@ int SecondStageMain(int argc, char** argv) { setpriority(PRIO_PROCESS, 0, 0); while (true) { // By default, sleep until something happens. - auto epoll_timeout = std::optional{kDiagnosticTimeout}; + std::chrono::milliseconds epoll_timeout{kDiagnosticTimeout}; auto shutdown_command = shutdown_state.CheckShutdown(); if (shutdown_command) { @@ -1168,7 +1168,7 @@ int SecondStageMain(int argc, char** argv) { if (next_process_action_time) { epoll_timeout = std::chrono::ceil( *next_process_action_time - boot_clock::now()); - if (*epoll_timeout < 0ms) epoll_timeout = 0ms; + if (epoll_timeout < 0ms) epoll_timeout = 0ms; } }