From 9145cae17815808c0e7f6487fe55e3ef91033fa8 Mon Sep 17 00:00:00 2001 From: Eric Caruso Date: Thu, 12 Dec 2019 16:33:03 -0800 Subject: libbrillo: small style fixes in AsynchronousSignalHandler Just some changes to return early on failure, etc. BUG=None TEST=unit tests Change-Id: I69c031db09edf526145227595690bc363efc3144 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/1965402 Tested-by: Eric Caruso Reviewed-by: Anand Mistry Commit-Queue: Eric Caruso Cr-Mirrored-From: https://chromium.googlesource.com/chromiumos/platform2 Cr-Mirrored-Commit: 18ca03a1f60eb104bba010a356ea981609ab42e4 --- brillo/asynchronous_signal_handler.cc | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/brillo/asynchronous_signal_handler.cc b/brillo/asynchronous_signal_handler.cc index d5fed50..4fb8542 100644 --- a/brillo/asynchronous_signal_handler.cc +++ b/brillo/asynchronous_signal_handler.cc @@ -60,10 +60,10 @@ void AsynchronousSignalHandler::RegisterHandler(int signal, void AsynchronousSignalHandler::UnregisterHandler(int signal) { Callbacks::iterator callback_it = registered_callbacks_.find(signal); - if (callback_it != registered_callbacks_.end()) { - registered_callbacks_.erase(callback_it); - ResetSignal(signal); - } + if (callback_it == registered_callbacks_.end()) + return; + registered_callbacks_.erase(callback_it); + ResetSignal(signal); } void AsynchronousSignalHandler::OnReadable() { @@ -80,9 +80,8 @@ void AsynchronousSignalHandler::OnReadable() { } const SignalHandler& callback = callback_it->second; bool must_unregister = callback.Run(info); - if (must_unregister) { + if (must_unregister) UnregisterHandler(signal); - } } } @@ -92,12 +91,12 @@ void AsynchronousSignalHandler::ResetSignal(int signal) { } void AsynchronousSignalHandler::UpdateSignals() { - if (descriptor_ != kInvalidDescriptor) { - CHECK_EQ(0, sigprocmask(SIG_SETMASK, &saved_signal_mask_, nullptr)); - CHECK_EQ(0, sigprocmask(SIG_BLOCK, &signal_mask_, nullptr)); - CHECK_EQ(descriptor_, - signalfd(descriptor_, &signal_mask_, SFD_CLOEXEC | SFD_NONBLOCK)); - } + if (descriptor_ == kInvalidDescriptor) + return; + CHECK_EQ(0, sigprocmask(SIG_SETMASK, &saved_signal_mask_, nullptr)); + CHECK_EQ(0, sigprocmask(SIG_BLOCK, &signal_mask_, nullptr)); + CHECK_EQ(descriptor_, + signalfd(descriptor_, &signal_mask_, SFD_CLOEXEC | SFD_NONBLOCK)); } } // namespace brillo -- cgit v1.2.3