Commit d59fec29 authored by Josh Poimboeuf's avatar Josh Poimboeuf
Browse files

tools/lib/subcmd: Replace NORETURN usage with __noreturn 



NORETURN is redundant with __noreturn, just use the latter.

Reviewed-by: default avatarMiroslav Benes <mbenes@suse.cz>
Link: https://lore.kernel.org/r/c7c83d1e6b3d2b0c3e65dd3790c22c772d3b2527.1681853186.git.jpoimboe@kernel.org


Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
parent 34245659

tools/lib/subcmd/parse-options.h

+2 −6
Original line number Diff line number Diff line
@@ -6,10 +6,6 @@ 
#include <stdbool.h>

#include <stdint.h>



#ifndef NORETURN

#define NORETURN __attribute__((__noreturn__))

#endif



enum parse_opt_type {

	/* special types */

	OPTION_END,
@@ -183,9 +179,9 @@ extern int parse_options_subcommand(int argc, const char **argv, 
				const char *const subcommands[],

				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);

extern NORETURN __attribute__((format(printf,3,4)))

extern __noreturn __attribute__((format(printf,3,4)))

void usage_with_options_msg(const char * const *usagestr,

			    const struct option *options,

			    const char *fmt, ...);

tools/lib/subcmd/subcmd-util.h

+2 −3
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ 
#include <stdarg.h>

#include <stdlib.h>

#include <stdio.h>



#define NORETURN __attribute__((__noreturn__))

#include <linux/compiler.h>



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);

}



static NORETURN inline void die(const char *err, ...)

static __noreturn inline void die(const char *err, ...)

{

	va_list params;