about summary refs log tree commit diff
path: root/src/exit
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-09-06 23:34:10 -0400
committerRich Felker <dalias@aerifal.cx>2012-09-06 23:34:10 -0400
commit0c05bd3a9c165cf2f0b9d6fa23a1f96532ddcdb3 (patch)
tree124c1d65e338abece7cf55c95cbc8195be94fe2f /src/exit
parent453059571c9dc84dd168631eced25ec2d7afd98e (diff)
downloadmusl-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/exit')
-rw-r--r--src/exit/_Exit.c2
-rw-r--r--src/exit/assert.c2
2 files changed, 2 insertions, 2 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);