From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932330AbcCXHlr (ORCPT ); Thu, 24 Mar 2016 03:41:47 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43230 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751454AbcCXHlj (ORCPT ); Thu, 24 Mar 2016 03:41:39 -0400 Date: Thu, 24 Mar 2016 00:41:20 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: tglx@linutronix.de, hpa@zytor.com, jolsa@kernel.org, namhyung@kernel.org, adrian.hunter@intel.com, mingo@kernel.org, wangnan0@huawei.com, linux-kernel@vger.kernel.org, acme@redhat.com Reply-To: namhyung@kernel.org, jolsa@kernel.org, tglx@linutronix.de, hpa@zytor.com, acme@redhat.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com, mingo@kernel.org, adrian.hunter@intel.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Simplify die() mechanism Git-Commit-ID: e476343860f8a4249106c4cae3d9a71fa1611fab X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e476343860f8a4249106c4cae3d9a71fa1611fab Gitweb: http://git.kernel.org/tip/e476343860f8a4249106c4cae3d9a71fa1611fab Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 23 Mar 2016 12:32:31 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-ade3n99xscldhg5mx2vzd8p3@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/usage.c | 8 +------- tools/perf/util/util.h | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/tools/perf/util/usage.c b/tools/perf/util/usage.c index 6adfa18..996046a 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) /* 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); } diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index 1b06216..2080142 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h @@ -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);