tools: Adopt __noreturn from kernel sources

To have a more compact way to specify that a function doesn't return,
instead of the open coded:

	__attribute__((noreturn))

And use it instead of the tools/perf/ specific variation, NORETURN.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-l0y144qzixcy5t4c6i7pdiqj@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 36ce5651
...@@ -19,3 +19,5 @@ ...@@ -19,3 +19,5 @@
/* &a[0] degrades to a pointer: a different type from an array */ /* &a[0] degrades to a pointer: a different type from an array */
#define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
#define __noreturn __attribute__((noreturn))
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <errno.h> #include <errno.h>
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/compiler.h>
#include <linux/time64.h> #include <linux/time64.h>
#include "../../perf.h" #include "../../perf.h"
...@@ -84,7 +85,7 @@ struct tables { ...@@ -84,7 +85,7 @@ struct tables {
static struct tables tables_global; static struct tables tables_global;
static void handler_call_die(const char *handler_name) NORETURN; static void handler_call_die(const char *handler_name) __noreturn;
static void handler_call_die(const char *handler_name) static void handler_call_die(const char *handler_name)
{ {
PyErr_Print(); PyErr_Print();
......
...@@ -16,13 +16,13 @@ static void report(const char *prefix, const char *err, va_list params) ...@@ -16,13 +16,13 @@ static void report(const char *prefix, const char *err, va_list params)
fprintf(stderr, " %s%s\n", prefix, msg); fprintf(stderr, " %s%s\n", prefix, msg);
} }
static NORETURN void usage_builtin(const char *err) static __noreturn void usage_builtin(const char *err)
{ {
fprintf(stderr, "\n Usage: %s\n", err); fprintf(stderr, "\n Usage: %s\n", err);
exit(129); exit(129);
} }
static NORETURN void die_builtin(const char *err, va_list params) static __noreturn void die_builtin(const char *err, va_list params)
{ {
report(" Fatal: ", err, params); report(" Fatal: ", err, params);
exit(128); exit(128);
...@@ -40,7 +40,7 @@ static void warn_builtin(const char *warn, va_list params) ...@@ -40,7 +40,7 @@ static void warn_builtin(const char *warn, va_list params)
/* If we are in a dlopen()ed .so write to a global variable would segfault /* If we are in a dlopen()ed .so write to a global variable would segfault
* (ugh), so keep things static. */ * (ugh), so keep things static. */
static void (*usage_routine)(const char *err) NORETURN = usage_builtin; static void (*usage_routine)(const char *err) __noreturn = usage_builtin;
static void (*error_routine)(const char *err, va_list params) = error_builtin; static void (*error_routine)(const char *err, va_list params) = error_builtin;
static void (*warn_routine)(const char *err, va_list params) = warn_builtin; static void (*warn_routine)(const char *err, va_list params) = warn_builtin;
......
...@@ -11,20 +11,18 @@ ...@@ -11,20 +11,18 @@
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <linux/compiler.h>
#include <linux/types.h> #include <linux/types.h>
#ifdef __GNUC__ #ifndef __GNUC__
#define NORETURN __attribute__((__noreturn__))
#else
#define NORETURN
#ifndef __attribute__ #ifndef __attribute__
#define __attribute__(x) #define __attribute__(x)
#endif #endif
#endif #endif
/* General helper functions */ /* General helper functions */
void usage(const char *err) NORETURN; void usage(const char *err) __noreturn;
void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2))); void die(const char *err, ...) __noreturn __attribute__((format (printf, 1, 2)));
int error(const char *err, ...) __attribute__((format (printf, 1, 2))); int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
void warning(const char *err, ...) __attribute__((format (printf, 1, 2))); void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment