From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751713AbbLIPne (ORCPT ); Wed, 9 Dec 2015 10:43:34 -0500 Received: from mail.kernel.org ([198.145.29.136]:55367 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751352AbbLIPnc (ORCPT ); Wed, 9 Dec 2015 10:43:32 -0500 Date: Wed, 9 Dec 2015 12:43:28 -0300 From: Arnaldo Carvalho de Melo To: Josh Poimboeuf Cc: Peter Zijlstra , Ingo Molnar , linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim Subject: Re: [PATCH v2 05/14] perf: Remove unused pager_use_color variable Message-ID: <20151209154328.GN15864@kernel.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Mon, Dec 07, 2015 at 10:21:43PM -0600, Josh Poimboeuf escreveu: > Signed-off-by: Josh Poimboeuf Thanks, applied, trying to go thru the cherry pickable ones in this kit. - Arnaldo > --- > 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(-) > delete mode 100644 tools/perf/util/environment.c > > diff --git a/tools/perf/util/Build b/tools/perf/util/Build > index 6c3bbd5..65fef59 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; > -- > 2.4.3