Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4763438 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Simplify die() mechanism 

This should die altogether, but for now lets remove a bit of this stuff,
as it is not used at all.

Cc: Adrian Hunter <adrian.hunter@intel.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-ade3n99xscldhg5mx2vzd8p3@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 236f71eb

tools/perf/util/usage.c

+1 −7
Original line number Diff line number Diff line
@@ -41,15 +41,9 @@ 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

 * (ugh), so keep things static. */

static void (*usage_routine)(const char *err) NORETURN = usage_builtin;

static void (*die_routine)(const char *err, va_list params) NORETURN = die_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;



void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN)

{

	die_routine = routine;

}



void set_warning_routine(void (*routine)(const char *err, va_list params))

{

	warn_routine = routine;
@@ -65,7 +59,7 @@ void die(const char *err, ...) 
	va_list params;



	va_start(params, err);

	die_routine(err, params);

	die_builtin(err, params);

	va_end(params);

}

tools/perf/util/util.h

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2))) 


#include "../../../include/linux/stringify.h"



extern void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN);

extern void set_warning_routine(void (*routine)(const char *err, va_list params));



extern int prefixcmp(const char *str, const char *prefix);