diff options
author | Namhyung Kim <namhyung.kim@lge.com> | 2012-04-30 00:55:06 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-05-02 15:17:25 -0400 |
commit | 7706f966323f32f3ea13121b5918851432876ae5 (patch) | |
tree | 65048a656dfb4e962ad3ff43c3d85bd5702f6795 /tools | |
parent | ca09b2e1b307724666577859eb460ac6d4c67330 (diff) |
perf ui gtk: Drop arg[cv] arguments from perf_gtk_setup_browser()
As perf doesn't allow to specify gtk command-line option, drop the
arguments and pass NULL to gtk_init().
This makes the function easier to be called from setup_browser().
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1335761711-31403-3-git-send-email-namhyung.kim@lge.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/builtin-report.c | 2 | ||||
-rw-r--r-- | tools/perf/ui/gtk/browser.c | 5 | ||||
-rw-r--r-- | tools/perf/util/cache.h | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index cec2b8cee80c..2b20001848f5 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c | |||
@@ -678,7 +678,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __used) | |||
678 | 678 | ||
679 | if (strcmp(report.input_name, "-") != 0) { | 679 | if (strcmp(report.input_name, "-") != 0) { |
680 | if (report.use_gtk) | 680 | if (report.use_gtk) |
681 | perf_gtk_setup_browser(argc, argv, true); | 681 | perf_gtk_setup_browser(true); |
682 | else | 682 | else |
683 | setup_browser(true); | 683 | setup_browser(true); |
684 | } else { | 684 | } else { |
diff --git a/tools/perf/ui/gtk/browser.c b/tools/perf/ui/gtk/browser.c index 258352a2356c..a1a83de3f459 100644 --- a/tools/perf/ui/gtk/browser.c +++ b/tools/perf/ui/gtk/browser.c | |||
@@ -9,10 +9,9 @@ | |||
9 | 9 | ||
10 | #define MAX_COLUMNS 32 | 10 | #define MAX_COLUMNS 32 |
11 | 11 | ||
12 | void perf_gtk_setup_browser(int argc, const char *argv[], | 12 | void perf_gtk_setup_browser(bool fallback_to_pager __used) |
13 | bool fallback_to_pager __used) | ||
14 | { | 13 | { |
15 | gtk_init(&argc, (char ***)&argv); | 14 | gtk_init(NULL, NULL); |
16 | } | 15 | } |
17 | 16 | ||
18 | void perf_gtk_exit_browser(bool wait_for_ok __used) | 17 | void perf_gtk_exit_browser(bool wait_for_ok __used) |
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h index 8dd224df3e54..d22ca689fb15 100644 --- a/tools/perf/util/cache.h +++ b/tools/perf/util/cache.h | |||
@@ -46,14 +46,14 @@ void exit_browser(bool wait_for_ok); | |||
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | #ifdef NO_GTK2_SUPPORT | 48 | #ifdef NO_GTK2_SUPPORT |
49 | static inline void perf_gtk_setup_browser(int argc __used, const char *argv[] __used, bool fallback_to_pager) | 49 | static inline void perf_gtk_setup_browser(bool fallback_to_pager) |
50 | { | 50 | { |
51 | if (fallback_to_pager) | 51 | if (fallback_to_pager) |
52 | setup_pager(); | 52 | setup_pager(); |
53 | } | 53 | } |
54 | static inline void perf_gtk_exit_browser(bool wait_for_ok __used) {} | 54 | static inline void perf_gtk_exit_browser(bool wait_for_ok __used) {} |
55 | #else | 55 | #else |
56 | void perf_gtk_setup_browser(int argc, const char *argv[], bool fallback_to_pager); | 56 | void perf_gtk_setup_browser(bool fallback_to_pager); |
57 | void perf_gtk_exit_browser(bool wait_for_ok); | 57 | void perf_gtk_exit_browser(bool wait_for_ok); |
58 | #endif | 58 | #endif |
59 | 59 | ||