about summary refs log tree commit diff
path: root/src/linux
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/linux
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/linux')
-rw-r--r--src/linux/err.c8
1 files changed, 4 insertions, 4 deletions
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);