Prep v228: Add remaining updates from upstream (2/3)

[elogind.git] / src / basic / signal-util.c

diff --git a/src/basic/signal-util.c b/src/basic/signal-util.c
index 90abe8af816d2df154d6ddbc123d0821475bbe87..b0ff4a6b761e57af5638dabcf6d5d00028c06b29 100644 (file)
--- a/src/basic/signal-util.c
+++ b/src/basic/signal-util.c
@@ -19,8 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "util.h"
+#include "parse-util.h"
 #include "signal-util.h"
+#include "string-table.h"
+#include "string-util.h"
+#include "util.h"
 
 int reset_all_signal_handlers(void) {
         static const struct sigaction sa = {
@@ -84,6 +87,8 @@ static int sigaction_many_ap(const struct sigaction *sa, int sig, va_list ap) {
         return r;
 }
 
+/// UNNEEDED by elogind
+#if 0
 int sigaction_many(const struct sigaction *sa, ...) {
         va_list ap;
         int r;
@@ -94,6 +99,7 @@ int sigaction_many(const struct sigaction *sa, ...) {
 
         return r;
 }
+#endif // 0
 
 int ignore_signals(int sig, ...) {
 
@@ -112,6 +118,8 @@ int ignore_signals(int sig, ...) {
         return r;
 }
 
+/// UNNEEDED by elogind
+#if 0
 int default_signals(int sig, ...) {
 
         static const struct sigaction sa = {
@@ -128,6 +136,7 @@ int default_signals(int sig, ...) {
 
         return r;
 }
+#endif // 0
 
 static int sigset_add_many_ap(sigset_t *ss, va_list ap) {
         int sig, r = 0;
@@ -266,3 +275,10 @@ int signal_from_string_try_harder(const char *s) {
 
         return signo;
 }
+
+/// UNNEEDED by elogind
+#if 0
+void nop_signal_handler(int sig) {
+        /* nothing here */
+}
+#endif // 0