summaryrefslogtreecommitdiff
path: root/src/event
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2018-08-06 11:48:25 +0200
committerMax Kellermann <max@musicpd.org>2018-08-06 12:01:46 +0200
commit7df0d3b7fc581ee63102a70baa19d3919a28a624 (patch)
treeff8d47bbebc6d7d974b864a210872869236d2082 /src/event
parentfdd101c4c56fd3d3b5ff9ee12016387d6fb88df1 (diff)
event/SignalMonitor: make SignalMonitorFinish() noexcept
Diffstat (limited to 'src/event')
-rw-r--r--src/event/SignalMonitor.cxx4
-rw-r--r--src/event/SignalMonitor.hxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/event/SignalMonitor.cxx b/src/event/SignalMonitor.cxx
index 71f603904..5c34d2057 100644
--- a/src/event/SignalMonitor.cxx
+++ b/src/event/SignalMonitor.cxx
@@ -147,7 +147,7 @@ x_sigaction(int signum, const struct sigaction &act)
#endif
void
-SignalMonitorFinish()
+SignalMonitorFinish() noexcept
{
#ifdef USE_SIGNALFD
std::fill_n(signal_handlers, MAX_SIGNAL, nullptr);
@@ -159,7 +159,7 @@ SignalMonitorFinish()
for (unsigned i = 0; i < MAX_SIGNAL; ++i) {
if (signal_handlers[i]) {
- x_sigaction(i, sa);
+ sigaction(i, &sa, nullptr);
signal_handlers[i] = nullptr;
}
}
diff --git a/src/event/SignalMonitor.hxx b/src/event/SignalMonitor.hxx
index 1930b3bcb..734977ec1 100644
--- a/src/event/SignalMonitor.hxx
+++ b/src/event/SignalMonitor.hxx
@@ -42,7 +42,7 @@ SignalMonitorInit(EventLoop &loop);
* Deinitialise the signal monitor subsystem.
*/
void
-SignalMonitorFinish();
+SignalMonitorFinish() noexcept;
/**
* Register a handler for the specified signal. The handler will be