diff options
Diffstat (limited to 'tools/perf/util/usage.c')
| -rw-r--r-- | tools/perf/util/usage.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/perf/util/usage.c b/tools/perf/util/usage.c index 6adfa18cdd4e..996046a66fe5 100644 --- a/tools/perf/util/usage.c +++ b/tools/perf/util/usage.c | |||
| @@ -41,15 +41,9 @@ static void warn_builtin(const char *warn, va_list params) | |||
| 41 | /* If we are in a dlopen()ed .so write to a global variable would segfault | 41 | /* If we are in a dlopen()ed .so write to a global variable would segfault |
| 42 | * (ugh), so keep things static. */ | 42 | * (ugh), so keep things static. */ |
| 43 | static void (*usage_routine)(const char *err) NORETURN = usage_builtin; | 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 | static void (*error_routine)(const char *err, va_list params) = error_builtin; | 44 | static void (*error_routine)(const char *err, va_list params) = error_builtin; |
| 46 | static void (*warn_routine)(const char *err, va_list params) = warn_builtin; | 45 | static void (*warn_routine)(const char *err, va_list params) = warn_builtin; |
| 47 | 46 | ||
| 48 | void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN) | ||
| 49 | { | ||
| 50 | die_routine = routine; | ||
| 51 | } | ||
| 52 | |||
| 53 | void set_warning_routine(void (*routine)(const char *err, va_list params)) | 47 | void set_warning_routine(void (*routine)(const char *err, va_list params)) |
| 54 | { | 48 | { |
| 55 | warn_routine = routine; | 49 | warn_routine = routine; |
| @@ -65,7 +59,7 @@ void die(const char *err, ...) | |||
| 65 | va_list params; | 59 | va_list params; |
| 66 | 60 | ||
| 67 | va_start(params, err); | 61 | va_start(params, err); |
| 68 | die_routine(err, params); | 62 | die_builtin(err, params); |
| 69 | va_end(params); | 63 | va_end(params); |
| 70 | } | 64 | } |
| 71 | 65 | ||
