perf tools: Remove unused pager_use_color variable

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/e540c61b3068761181db6d9b1b3411990bafdb2f.1449548395.git.jpoimboe@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 0513dd525d87637d94be1bbba83d3ff566123067..62392ab234f8e21e6ca80995a3b16c9e1c8c9893 100644 (file)
--- 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 c861373aaed33dafd233a7bf5eebefa4dfd9874b..4c2b76499dd59d317ce8eaec94167e362ebc71a2 100644 (file)
--- 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 9b9565416f9037fb59e7e4382b58b34e4857a136..e5fb88bab9e1c416a3c53fe5036f8eb57f64a55d 100644 (file)
--- 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 (file)
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;