>From 90c1f4bb11d0ce6fa36051f0d8a94f11580b4b37 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <tho...@m3y3r.de>
Date: Tue, 9 May 2017 18:56:28 +0200
Subject: [PATCH] um: Document change_sig and switch to bool type
---
arch/um/include/shared/os.h | 3 ++-
arch/um/os-Linux/main.c | 4 ++--
arch/um/os-Linux/signal.c | 10 +++++++++-
arch/um/os-Linux/start_up.c | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h
index de5d572..8d0ae77 100644
--- a/arch/um/include/shared/os.h
+++ b/arch/um/include/shared/os.h
@@ -9,6 +9,7 @@
#define __OS_H__
#include <stdarg.h>
+#include <stdbool.h>
#include <irq_user.h>
#include <longjmp.h>
#include <mm_id.h>
@@ -226,7 +227,7 @@ extern void timer_set_signal_handler(void);
extern void set_sigstack(void *sig_stack, int size);
extern void remove_sigstack(void);
extern void set_handler(int sig);
-extern int change_sig(int signal, int on);
+extern int change_sig(int signal, bool on);
extern void block_signals(void);
extern void unblock_signals(void);
extern int get_signals(void);
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index 9d499de..f23b3c1 100644
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -152,7 +152,7 @@ int __init main(int argc, char **argv, char **envp)
#endif
do_uml_initcalls();
- change_sig(SIGPIPE, 0);
+ change_sig(SIGPIPE, false);
ret = linux_main(argc, argv);
/*
@@ -160,7 +160,7 @@ int __init main(int argc, char **argv, char **envp)
* off the profiling time, but UML dies with a SIGPROF just before
* exiting when profiling is active.
*/
- change_sig(SIGPROF, 0);
+ change_sig(SIGPROF, false);
/*
* This signal stuff used to be in the reboot case. However,
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index a86d7cc..024f666 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -8,6 +8,7 @@
#include <stdlib.h>
#include <stdarg.h>
+#include <stdbool.h>
#include <errno.h>
#include <signal.h>
#include <strings.h>
@@ -231,7 +232,14 @@ void set_handler(int sig)
panic("sigprocmask failed - errno = %d\n", errno);
}
-int change_sig(int signal, int on)
+/**
+ * change_sig() - enable or disable a signal of the calling thread
+ * @signal: The number to signal to en- or disable
+ * @on: What to do: enable or disable the given signal
+ *
+ * Return: Zero if successful, negative error number if unsuccessful.
+ */
+int change_sig(int signal, bool on)
{
sigset_t sigset;
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c
index 22a358e..8279371a 100644
--- a/arch/um/os-Linux/start_up.c
+++ b/arch/um/os-Linux/start_up.c
@@ -32,7 +32,7 @@ static void ptrace_child(void)
int pid = os_getpid(), ppid = getppid();
int sc_result;
- if (change_sig(SIGWINCH, 0) < 0 ||
+ if (change_sig(SIGWINCH, false) < 0 ||
ptrace(PTRACE_TRACEME, 0, 0, 0) < 0) {
perror("ptrace");
kill(pid, SIGKILL);
--
2.9.3
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
