From 64725031be90808f918423527cd2a32627bdf285 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <wak@google.com>
Date: Mon, 1 Jul 2019 17:53:13 -0700
Subject: signal: Use callCheckErrno

Change-Id: I75f010a17366550fd9cda550f973ae40951cbcb9
Signed-off-by: William A. Kennington III <wak@google.com>
---
 src/stdplus/signal.cpp | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/stdplus/signal.cpp b/src/stdplus/signal.cpp
index 10f8e39..85b9f1e 100644
--- a/src/stdplus/signal.cpp
+++ b/src/stdplus/signal.cpp
@@ -1,5 +1,6 @@
 #include <signal.h>
 #include <stdplus/signal.hpp>
+#include <stdplus/util/cexec.hpp>
 #include <system_error>
 
 namespace stdplus
@@ -7,25 +8,14 @@ namespace stdplus
 namespace signal
 {
 
+using util::callCheckErrno;
+
 void block(int signum)
 {
     sigset_t set;
-    if (sigprocmask(SIG_BLOCK, nullptr, &set) < 0)
-    {
-        throw std::system_error(errno, std::generic_category(),
-                                "sigprocmask get");
-    }
-
-    if (sigaddset(&set, signum) < 0)
-    {
-        throw std::system_error(errno, std::generic_category(), "sigaddset");
-    }
-
-    if (sigprocmask(SIG_BLOCK, &set, nullptr) < 0)
-    {
-        throw std::system_error(errno, std::generic_category(),
-                                "sigprocmask set");
-    }
+    callCheckErrno("sigprocmask get", sigprocmask, SIG_BLOCK, nullptr, &set);
+    callCheckErrno("sigaddset", sigaddset, &set, signum);
+    callCheckErrno("sigprocmask set", sigprocmask, SIG_BLOCK, &set, nullptr);
 }
 
 } // namespace signal
-- 
cgit v1.2.1