diff options
Diffstat (limited to 'lib/libc/signal')
| -rw-r--r-- | lib/libc/signal/psignal.c | 3 | ||||
| -rw-r--r-- | lib/libc/signal/pthread_sigmask.c | 1 | ||||
| -rw-r--r-- | lib/libc/signal/sig2str.c | 9 | ||||
| -rw-r--r-- | lib/libc/signal/sigabbrev.h | 16 | ||||
| -rw-r--r-- | lib/libc/signal/sigaction.c | 3 | ||||
| -rw-r--r-- | lib/libc/signal/sigtimedwait.c | 3 |
6 files changed, 12 insertions, 23 deletions
diff --git a/lib/libc/signal/psignal.c b/lib/libc/signal/psignal.c index fdf0dc94..d8c35bbd 100644 --- a/lib/libc/signal/psignal.c +++ b/lib/libc/signal/psignal.c @@ -4,6 +4,5 @@ void psignal(int signum, const char *message) { - fprintf(stderr, "%s%s%s\n", message ? message : "", message ? ": " : "", - strsignal(signum)); + fprintf(stderr, "%s%s%s\n", message ? message : "", message ? ": " : "", strsignal(signum)); } diff --git a/lib/libc/signal/pthread_sigmask.c b/lib/libc/signal/pthread_sigmask.c index 89c4f0d3..15eacd72 100644 --- a/lib/libc/signal/pthread_sigmask.c +++ b/lib/libc/signal/pthread_sigmask.c @@ -3,7 +3,6 @@ #undef __ASSEMBLY__ #include <errno.h> -#include <libc.h> #include <stddef.h> #include <sys/cdefs.h> diff --git a/lib/libc/signal/sig2str.c b/lib/libc/signal/sig2str.c index eec1c805..52bd3ec2 100644 --- a/lib/libc/signal/sig2str.c +++ b/lib/libc/signal/sig2str.c @@ -6,8 +6,7 @@ int sig2str(int signum, char *str) { if (signum >= SIGHUP && signum <= SIGSYS) { - strlcpy(str, __sys_signame[signum - SIGHUP], - sizeof(__sys_signame[signum - SIGHUP])); + strlcpy(str, __sys_signame[signum - SIGHUP], sizeof(__sys_signame[signum - SIGHUP])); return 0; } @@ -23,11 +22,9 @@ int sig2str(int signum, char *str) if (signum > SIGRTMIN && signum < SIGRTMAX) { if (signum - SIGRTMIN <= SIGRTMAX - signum) { - snprintf(str, sizeof("RTMIN+") + 1, "RTMIN+%d", - signum - SIGRTMIN); + snprintf(str, sizeof("RTMIN+") + 1, "RTMIN+%d", signum - SIGRTMIN); } else { - snprintf(str, sizeof("RTMAX-") + 1, "RTMAX-%d", - SIGRTMAX - signum); + snprintf(str, sizeof("RTMAX-") + 1, "RTMAX-%d", SIGRTMAX - signum); } return 0; } diff --git a/lib/libc/signal/sigabbrev.h b/lib/libc/signal/sigabbrev.h index 4ed6d7d3..b289fa97 100644 --- a/lib/libc/signal/sigabbrev.h +++ b/lib/libc/signal/sigabbrev.h @@ -1,9 +1,8 @@ #include <signal.h> const char *const sys_sigabbrev[64] = { - [SIGABRT] = "ABRT", [SIGALRM] = "ALRM", [SIGBUS] = "BUS", - [SIGCHLD] = "CHLD", [SIGFPE] = "FPE", [SIGHUP] = "HUP", - [SIGILL] = "ILL", [SIGINT] = "INT", [SIGIO] = "IO", + [SIGABRT] = "ABRT", [SIGALRM] = "ALRM", [SIGBUS] = "BUS", [SIGCHLD] = "CHLD", [SIGFPE] = "FPE", + [SIGHUP] = "HUP", [SIGILL] = "ILL", [SIGINT] = "INT", [SIGIO] = "IO", #if defined(SIGIOT) && (SIGIOT != SIGABRT) [SIGIOT] = "IOT", #endif @@ -11,11 +10,8 @@ const char *const sys_sigabbrev[64] = { #if defined(SIGPOLL) && (SIGPOLL != SIGIO) [SIGPOLL] = "POLL", #endif - [SIGPROF] = "PROF", [SIGPWR] = "PWR", [SIGQUIT] = "QUIT", - [SIGSEGV] = "SEGV", [SIGSTKFLT] = "STKFLT", [SIGSTOP] = "STOP", - [SIGSYS] = "SYS", [SIGTERM] = "TERM", [SIGTSTP] = "TSTP", - [SIGTTIN] = "TTIN", [SIGTTOU] = "TTOU", [SIGURG] = "URG", - [SIGUSR1] = "USR1", [SIGUSR2] = "USR2", [SIGVTALRM] = "VTALRM", - [SIGWINCH] = "WINCH", [SIGXCPU] = "XCPU", [SIGXFSZ] = "XFSZ", - [SIGCONT] = "CONT", [SIGTRAP] = "TRAP", + [SIGPROF] = "PROF", [SIGPWR] = "PWR", [SIGQUIT] = "QUIT", [SIGSEGV] = "SEGV", [SIGSTKFLT] = "STKFLT", + [SIGSTOP] = "STOP", [SIGSYS] = "SYS", [SIGTERM] = "TERM", [SIGTSTP] = "TSTP", [SIGTTIN] = "TTIN", + [SIGTTOU] = "TTOU", [SIGURG] = "URG", [SIGUSR1] = "USR1", [SIGUSR2] = "USR2", [SIGVTALRM] = "VTALRM", + [SIGWINCH] = "WINCH", [SIGXCPU] = "XCPU", [SIGXFSZ] = "XFSZ", [SIGCONT] = "CONT", [SIGTRAP] = "TRAP", }; diff --git a/lib/libc/signal/sigaction.c b/lib/libc/signal/sigaction.c index 95f485d3..23231899 100644 --- a/lib/libc/signal/sigaction.c +++ b/lib/libc/signal/sigaction.c @@ -3,8 +3,7 @@ #include <signal.h> // for sigaction, sigset_t #include <syscall.h> // for __syscall_4, syscall -int sigaction(int sig, const struct sigaction *restrict act, - struct sigaction *restrict oact) +int sigaction(int sig, const struct sigaction *restrict act, struct sigaction *restrict oact) { return syscall(rt_sigaction, sig, act, oact, sizeof(sigset_t)); } diff --git a/lib/libc/signal/sigtimedwait.c b/lib/libc/signal/sigtimedwait.c index e33743d9..0be3c712 100644 --- a/lib/libc/signal/sigtimedwait.c +++ b/lib/libc/signal/sigtimedwait.c @@ -8,8 +8,7 @@ struct timespec; #define _NSIG 64 -int sigtimedwait(const sigset_t *restrict set, siginfo_t *restrict info, - const struct timespec *restrict timeout) +int sigtimedwait(const sigset_t *restrict set, siginfo_t *restrict info, const struct timespec *restrict timeout) { return syscall(rt_sigtimedwait, set, info, timeout, _NSIG / 8); } |