From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755207AbbLJISs (ORCPT ); Thu, 10 Dec 2015 03:18:48 -0500 Received: from terminus.zytor.com ([198.137.202.10]:55163 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932086AbbLJISp (ORCPT ); Thu, 10 Dec 2015 03:18:45 -0500 Date: Thu, 10 Dec 2015 00:18:03 -0800 From: tip-bot for Josh Poimboeuf Message-ID: Cc: linux-kernel@vger.kernel.org, namhyung@kernel.org, peterz@infradead.org, jpoimboe@redhat.com, jolsa@redhat.com, hpa@zytor.com, tglx@linutronix.de, acme@redhat.com, mingo@kernel.org Reply-To: namhyung@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, jolsa@redhat.com, hpa@zytor.com, jpoimboe@redhat.com, tglx@linutronix.de, acme@redhat.com, peterz@infradead.org In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Remove unused pager_use_color variable Git-Commit-ID: de7cf7cadca3a3c32c1f1dbf4593a54f236e2dcf 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: de7cf7cadca3a3c32c1f1dbf4593a54f236e2dcf Gitweb: http://git.kernel.org/tip/de7cf7cadca3a3c32c1f1dbf4593a54f236e2dcf Author: Josh Poimboeuf AuthorDate: Mon, 7 Dec 2015 22:21:43 -0600 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 9 Dec 2015 13:42:02 -0300 perf tools: Remove unused pager_use_color variable Signed-off-by: Josh Poimboeuf Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/e540c61b3068761181db6d9b1b3411990bafdb2f.1449548395.git.jpoimboe@redhat.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/Build | 1 - tools/perf/util/cache.h | 1 - tools/perf/util/color.c | 2 +- tools/perf/util/environment.c | 8 -------- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 0513dd5..62392ab 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -6,7 +6,6 @@ libperf-y += config.o libperf-y += ctype.o libperf-y += db-export.o libperf-y += env.o -libperf-y += environment.o libperf-y += event.o libperf-y += evlist.o libperf-y += evsel.o diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h index c861373..4c2b764 100644 --- a/tools/perf/util/cache.h +++ b/tools/perf/util/cache.h @@ -31,7 +31,6 @@ extern const char *perf_config_dirname(const char *, const char *); /* pager.c */ extern void setup_pager(void); extern int pager_in_use(void); -extern int pager_use_color; char *alias_lookup(const char *alias); int split_cmdline(char *cmdline, const char ***argv); diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c index 9b95654..e5fb88b 100644 --- a/tools/perf/util/color.c +++ b/tools/perf/util/color.c @@ -24,7 +24,7 @@ int perf_config_colorbool(const char *var, const char *value, int stdout_is_tty) auto_color: if (stdout_is_tty < 0) stdout_is_tty = isatty(1); - if (stdout_is_tty || (pager_in_use() && pager_use_color)) { + if (stdout_is_tty || pager_in_use()) { char *term = getenv("TERM"); if (term && strcmp(term, "dumb")) return 1; diff --git a/tools/perf/util/environment.c b/tools/perf/util/environment.c deleted file mode 100644 index 7405123..0000000 --- a/tools/perf/util/environment.c +++ /dev/null @@ -1,8 +0,0 @@ -/* - * We put all the perf config variables in this same object - * file, so that programs can link against the config parser - * without having to link against all the rest of perf. - */ -#include "cache.h" - -int pager_use_color = 1;