From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752197AbdGAIuk (ORCPT ); Sat, 1 Jul 2017 04:50:40 -0400 Received: from terminus.zytor.com ([65.50.211.136]:43517 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751729AbdGAIuh (ORCPT ); Sat, 1 Jul 2017 04:50:37 -0400 Date: Sat, 1 Jul 2017 01:48:24 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dsahern@gmail.com, tglx@linutronix.de, hpa@zytor.com, namhyung@kernel.org, wangnan0@huawei.com, mingo@kernel.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, acme@redhat.com, jolsa@kernel.org Reply-To: wangnan0@huawei.com, mingo@kernel.org, namhyung@kernel.org, acme@redhat.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, dsahern@gmail.com, hpa@zytor.com, tglx@linutronix.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Remove warning() Git-Commit-ID: b211d79ac1ad43d6d8d82e7f1a5c26055a249135 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: b211d79ac1ad43d6d8d82e7f1a5c26055a249135 Gitweb: http://git.kernel.org/tip/b211d79ac1ad43d6d8d82e7f1a5c26055a249135 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 27 Jun 2017 11:13:20 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 27 Jun 2017 11:13:20 -0300 perf tools: Remove warning() Now everything uses pr_warning(), so ditch it. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-hv8r0mgdhk73wtfq3zrhavgx@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/parse-events.c | 13 ------------- tools/perf/util/usage.c | 20 -------------------- tools/perf/util/util.h | 3 --- 3 files changed, 36 deletions(-) diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c index 7fad885..812a053 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -1810,17 +1810,6 @@ static int test_pmu_events(void) return ret; } -static void debug_warn(const char *warn, va_list params) -{ - char msg[1024]; - - if (verbose <= 0) - return; - - vsnprintf(msg, sizeof(msg), warn, params); - fprintf(stderr, " Warning: %s\n", msg); -} - int test__parse_events(int subtest __maybe_unused) { int ret1, ret2 = 0; @@ -1832,8 +1821,6 @@ do { \ ret2 = ret1; \ } while (0) - set_warning_routine(debug_warn); - TEST_EVENTS(test__events); if (test_pmu()) diff --git a/tools/perf/util/usage.c b/tools/perf/util/usage.c index aacb65e..37225dc 100644 --- a/tools/perf/util/usage.c +++ b/tools/perf/util/usage.c @@ -33,21 +33,10 @@ static void error_builtin(const char *err, va_list params) report(" Error: ", err, params); } -static void warn_builtin(const char *warn, va_list params) -{ - report(" Warning: ", warn, 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 (*error_routine)(const char *err, va_list params) = error_builtin; -static void (*warn_routine)(const char *err, va_list params) = warn_builtin; - -void set_warning_routine(void (*routine)(const char *err, va_list params)) -{ - warn_routine = routine; -} void usage(const char *err) { @@ -72,12 +61,3 @@ int error(const char *err, ...) va_end(params); return -1; } - -void warning(const char *warn, ...) -{ - va_list params; - - va_start(params, warn); - warn_routine(warn, params); - va_end(params); -} diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index 978572d..3927ab8 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h @@ -17,9 +17,6 @@ void usage(const char *err) __noreturn; void die(const char *err, ...) __noreturn __printf(1, 2); int error(const char *err, ...) __printf(1, 2); -void warning(const char *err, ...) __printf(1, 2); - -void set_warning_routine(void (*routine)(const char *err, va_list params)); static inline void *zalloc(size_t size) {