diff options
author | Rich Felker <dalias@aerifal.cx> | 2012-09-06 23:34:10 -0400 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2012-09-06 23:34:10 -0400 |
commit | 0c05bd3a9c165cf2f0b9d6fa23a1f96532ddcdb3 (patch) | |
tree | 124c1d65e338abece7cf55c95cbc8195be94fe2f /src | |
parent | 453059571c9dc84dd168631eced25ec2d7afd98e (diff) | |
download | musl-0c05bd3a9c165cf2f0b9d6fa23a1f96532ddcdb3.tar.gz musl-0c05bd3a9c165cf2f0b9d6fa23a1f96532ddcdb3.tar.xz musl-0c05bd3a9c165cf2f0b9d6fa23a1f96532ddcdb3.zip |
further use of _Noreturn, for non-plain-C functions
note that POSIX does not specify these functions as _Noreturn, because POSIX is aligned with C99, not the new C11 standard. when POSIX is eventually updated to C11, it will almost surely give these functions the _Noreturn attribute. for now, the actual _Noreturn keyword is not used anyway when compiling with a c99 compiler, which is what POSIX requires; the GCC __attribute__ is used instead if it's available, however. in a few places, I've added infinite for loops at the end of _Noreturn functions to silence compiler warnings. presumably __buildin_unreachable could achieve the same thing, but it would only work on newer GCCs and would not be portable. the loops should have near-zero code size cost anyway. like the previous _Noreturn commit, this one is based on patches contributed by philomath.
Diffstat (limited to 'src')
-rw-r--r-- | src/exit/_Exit.c | 2 | ||||
-rw-r--r-- | src/exit/assert.c | 2 | ||||
-rw-r--r-- | src/linux/err.c | 8 | ||||
-rw-r--r-- | src/signal/siglongjmp.c | 2 | ||||
-rw-r--r-- | src/thread/pthread_create.c | 4 | ||||
-rw-r--r-- | src/unistd/_exit.c | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/exit/_Exit.c b/src/exit/_Exit.c index c00a2ffb..7a6115c7 100644 --- a/src/exit/_Exit.c +++ b/src/exit/_Exit.c @@ -4,5 +4,5 @@ _Noreturn void _Exit(int ec) { __syscall(SYS_exit_group, ec); - __syscall(SYS_exit, ec); + for (;;) __syscall(SYS_exit, ec); } diff --git a/src/exit/assert.c b/src/exit/assert.c index e87442a7..49b0dc3e 100644 --- a/src/exit/assert.c +++ b/src/exit/assert.c @@ -1,7 +1,7 @@ #include <stdio.h> #include <stdlib.h> -void __assert_fail(const char *expr, const char *file, int line, const char *func) +_Noreturn void __assert_fail(const char *expr, const char *file, int line, const char *func) { fprintf(stderr, "Assertion failed: %s (%s: %s: %d)\n", expr, file, func, line); fflush(NULL); diff --git a/src/linux/err.c b/src/linux/err.c index c291136d..0f748538 100644 --- a/src/linux/err.c +++ b/src/linux/err.c @@ -15,13 +15,13 @@ void vwarnx(const char *fmt, va_list ap) putc('\n', stderr); } -void verr(int status, const char *fmt, va_list ap) +_Noreturn void verr(int status, const char *fmt, va_list ap) { vwarn(fmt, ap); exit(status); } -void verrx(int status, const char *fmt, va_list ap) +_Noreturn void verrx(int status, const char *fmt, va_list ap) { vwarnx(fmt, ap); exit(status); @@ -43,7 +43,7 @@ void warnx(const char *fmt, ...) va_end(ap); } -void err(int status, const char *fmt, ...) +_Noreturn void err(int status, const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -51,7 +51,7 @@ void err(int status, const char *fmt, ...) va_end(ap); } -void errx(int status, const char *fmt, ...) +_Noreturn void errx(int status, const char *fmt, ...) { va_list ap; va_start(ap, fmt); diff --git a/src/signal/siglongjmp.c b/src/signal/siglongjmp.c index e9a61314..d0e4f67d 100644 --- a/src/signal/siglongjmp.c +++ b/src/signal/siglongjmp.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include "syscall.h" -void siglongjmp(sigjmp_buf buf, int ret) +_Noreturn void siglongjmp(sigjmp_buf buf, int ret) { if (buf->__fl) __syscall(SYS_rt_sigprocmask, SIG_SETMASK, buf->__ss, 0, __SYSCALL_SSLEN); diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index 4567b41c..d8b8f0fc 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -8,7 +8,7 @@ weak_alias(dummy_0, __synccall_lock); weak_alias(dummy_0, __synccall_unlock); weak_alias(dummy_0, __pthread_tsd_run_dtors); -void pthread_exit(void *result) +_Noreturn void pthread_exit(void *result) { pthread_t self = pthread_self(); int n; @@ -43,7 +43,7 @@ void pthread_exit(void *result) __unmapself(self->map_base, self->map_size); } - __syscall(SYS_exit, 0); + for (;;) __syscall(SYS_exit, 0); } void __do_cleanup_push(struct __ptcb *cb) diff --git a/src/unistd/_exit.c b/src/unistd/_exit.c index d2e84c4c..76994823 100644 --- a/src/unistd/_exit.c +++ b/src/unistd/_exit.c @@ -1,7 +1,7 @@ #include <unistd.h> #include <stdlib.h> -void _exit(int status) +_Noreturn void _exit(int status) { _Exit(status); } |