perf tools: Simplify die() mechanism
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: e476343860f8a4249106c4cae3d9a71fa1611fab Gitweb: http://git.kernel.org/tip/e476343860f8a4249106c4cae3d9a71fa1611fab Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 23 Mar 2016 12:32:31 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 23 Mar 2016 12:32:31 -0300
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 <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/usage.c | 8 +------- tools/perf/util/util.h | 1 - 2 files changed, 1 insertion(+), 8 deletions(-)
tools/perf/util/usage.c +1 -7
@@ -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
@@ -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);