diff options
| author | Eric Caruso <ejcaruso@chromium.org> | 2019-12-12 16:33:03 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-13 09:12:49 +0000 |
| commit | 9145cae17815808c0e7f6487fe55e3ef91033fa8 (patch) | |
| tree | 24a76f2a73c1f1d56e43b2b59a924b5a8ea54d73 | |
| parent | a81c4bdf1dd3ccaf69d6e9b4b1987325ba5854e3 (diff) | |
| download | platform_external_libbrillo-9145cae17815808c0e7f6487fe55e3ef91033fa8.tar.gz platform_external_libbrillo-9145cae17815808c0e7f6487fe55e3ef91033fa8.tar.bz2 platform_external_libbrillo-9145cae17815808c0e7f6487fe55e3ef91033fa8.zip | |
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 <ejcaruso@chromium.org>
Reviewed-by: Anand Mistry <amistry@chromium.org>
Commit-Queue: Eric Caruso <ejcaruso@chromium.org>
Cr-Mirrored-From: https://chromium.googlesource.com/chromiumos/platform2
Cr-Mirrored-Commit: 18ca03a1f60eb104bba010a356ea981609ab42e4
| -rw-r--r-- | brillo/asynchronous_signal_handler.cc | 23 |
1 files 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 |