提交 0c05bd3a 编写于 作者: R Rich Felker

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.
上级 45305957
#undef assert
#if __STDC_VERSION__ >= 201112L
#elif defined(__GNUC__)
#define _Noreturn __attribute__((__noreturn__))
#else
#define _Noreturn
#endif
#ifdef NDEBUG
#define assert(x) (void)0
#else
......@@ -10,7 +17,7 @@
extern "C" {
#endif
void __assert_fail (const char *, const char *, int, const char *);
_Noreturn void __assert_fail (const char *, const char *, int, const char *);
#ifdef __cplusplus
}
......
#ifndef _ERR_H
#define _ERR_H
#if __STDC_VERSION__ >= 201112L
#elif defined(__GNUC__)
#define _Noreturn __attribute__((__noreturn__))
#else
#define _Noreturn
#endif
#include <stdarg.h>
#ifdef __cplusplus
......@@ -12,10 +19,10 @@ void vwarn(const char *, va_list);
void warnx(const char *, ...);
void vwarnx(const char *, va_list);
void err(int, const char *, ...);
void verr(int, const char *, va_list);
void errx(int, const char *, ...);
void verrx(int, const char *, va_list);
_Noreturn void err(int, const char *, ...);
_Noreturn void verr(int, const char *, va_list);
_Noreturn void errx(int, const char *, ...);
_Noreturn void verrx(int, const char *, va_list);
#ifdef __cplusplus
}
......
......@@ -10,6 +10,13 @@ extern "C" {
#define __restrict
#endif
#if __STDC_VERSION__ >= 201112L
#elif defined(__GNUC__)
#define _Noreturn __attribute__((__noreturn__))
#else
#define _Noreturn
#endif
#define __NEED_time_t
#define __NEED_clockid_t
#define __NEED_struct_timespec
......@@ -79,7 +86,7 @@ extern "C" {
int pthread_create(pthread_t *__restrict, const pthread_attr_t *__restrict, void *(*)(void *), void *__restrict);
int pthread_detach(pthread_t);
void pthread_exit(void *);
_Noreturn void pthread_exit(void *);
int pthread_join(pthread_t, void **);
#ifdef __GNUC__
......
......@@ -24,14 +24,14 @@ typedef struct {
unsigned long __ss[128/sizeof(long)];
} sigjmp_buf[1];
int sigsetjmp (sigjmp_buf, int);
void siglongjmp (sigjmp_buf, int);
_Noreturn void siglongjmp (sigjmp_buf, int);
#endif
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
|| defined(_BSD_SOURCE)
int _setjmp (jmp_buf);
void _longjmp (jmp_buf, int);
_Noreturn void _longjmp (jmp_buf, int);
#endif
......
......@@ -11,6 +11,13 @@ extern "C" {
#define __restrict
#endif
#if __STDC_VERSION__ >= 201112L
#elif defined(__GNUC__)
#define _Noreturn __attribute__((__noreturn__))
#else
#define _Noreturn
#endif
#define STDIN_FILENO 0
#define STDOUT_FILENO 1
#define STDERR_FILENO 2
......@@ -90,7 +97,7 @@ int execl(const char *, const char *, ...);
int execvp(const char *, char *const []);
int execlp(const char *, const char *, ...);
int fexecve(int, char *const [], char *const []);
void _exit(int);
_Noreturn void _exit(int);
pid_t getpid(void);
pid_t getppid(void);
......
......@@ -4,5 +4,5 @@
_Noreturn void _Exit(int ec)
{
__syscall(SYS_exit_group, ec);
__syscall(SYS_exit, ec);
for (;;) __syscall(SYS_exit, ec);
}
#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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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)
......
#include <unistd.h>
#include <stdlib.h>
void _exit(int status)
_Noreturn void _exit(int status)
{
_Exit(status);
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册