Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Arnaldo Carvalho de Melo <acme@redhat.com>

+1 -8
+1 -7
tools/perf/util/usage.c
··· 41 41 /* If we are in a dlopen()ed .so write to a global variable would segfault 42 42 * (ugh), so keep things static. */ 43 43 static void (*usage_routine)(const char *err) NORETURN = usage_builtin; 44 - static void (*die_routine)(const char *err, va_list params) NORETURN = die_builtin; 45 44 static void (*error_routine)(const char *err, va_list params) = error_builtin; 46 45 static void (*warn_routine)(const char *err, va_list params) = warn_builtin; 47 - 48 - void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN) 49 - { 50 - die_routine = routine; 51 - } 52 46 53 47 void set_warning_routine(void (*routine)(const char *err, va_list params)) 54 48 { ··· 59 65 va_list params; 60 66 61 67 va_start(params, err); 62 - die_routine(err, params); 68 + die_builtin(err, params); 63 69 va_end(params); 64 70 } 65 71
-1
tools/perf/util/util.h
··· 140 140 141 141 #include "../../../include/linux/stringify.h" 142 142 143 - extern void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN); 144 143 extern void set_warning_routine(void (*routine)(const char *err, va_list params)); 145 144 146 145 extern int prefixcmp(const char *str, const char *prefix);