git
/
linux
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools/lib/subcmd: Replace NORETURN usage with __noreturn 

NORETURN is redundant with __noreturn, just use the latter.

Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Link: https://lore.kernel.org/r/c7c83d1e6b3d2b0c3e65dd3790c22c772d3b2527.1681853186.git.jpoimboe@kernel.org
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
This commit is contained in:
Josh Poimboeuf 2023-04-18 14:27:53 -07:00
parent 34245659de
commit d59fec29b1
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/lib/subcmd/parse-options.h
View File

@ -6,10 +6,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#ifndef NORETURN
#define NORETURN __attribute__((__noreturn__))
#endif
enum parse_opt_type { enum parse_opt_type {
/* special types */ /* special types */
OPTION_END, OPTION_END,
@ -183,9 +179,9 @@ extern int parse_options_subcommand(int argc, const char **argv,
const char *const subcommands[], const char *const subcommands[],
const char *usagestr[], int flags); const char *usagestr[], int flags);
extern NORETURN void usage_with_options(const char * const *usagestr, extern __noreturn void usage_with_options(const char * const *usagestr,
const struct option *options); const struct option *options);
extern NORETURN __attribute__((format(printf,3,4))) extern __noreturn __attribute__((format(printf,3,4)))
void usage_with_options_msg(const char * const *usagestr, void usage_with_options_msg(const char * const *usagestr,
const struct option *options, const struct option *options,
const char *fmt, ...); const char *fmt, ...);

5
tools/lib/subcmd/subcmd-util.h
View File

@ -5,8 +5,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <linux/compiler.h>
#define NORETURN __attribute__((__noreturn__))
static inline void report(const char *prefix, const char *err, va_list params) static inline void report(const char *prefix, const char *err, va_list params)
{ {
@ -15,7 +14,7 @@ static inline 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 inline void die(const char *err, ...) static __noreturn inline void die(const char *err, ...)
{ {
va_list params; va_list params;