Skip to content

Commit

Permalink
perf ui gtk: Drop arg[cv] arguments from perf_gtk_setup_browser()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Namhyung Kim authored and Arnaldo Carvalho de Melo committed May 2, 2012
1 parent ca09b2e commit 7706f96
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion tools/perf/builtin-report.c
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)

if (strcmp(report.input_name, "-") != 0) {
if (report.use_gtk)
perf_gtk_setup_browser(argc, argv, true);
perf_gtk_setup_browser(true);
else
setup_browser(true);
} else {
Expand Down
5 changes: 2 additions & 3 deletions tools/perf/ui/gtk/browser.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@

#define MAX_COLUMNS 32

void perf_gtk_setup_browser(int argc, const char *argv[],
bool fallback_to_pager __used)
void perf_gtk_setup_browser(bool fallback_to_pager __used)
{
gtk_init(&argc, (char ***)&argv);
gtk_init(NULL, NULL);
}

void perf_gtk_exit_browser(bool wait_for_ok __used)
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/util/cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ void exit_browser(bool wait_for_ok);
#endif

#ifdef NO_GTK2_SUPPORT
static inline void perf_gtk_setup_browser(int argc __used, const char *argv[] __used, bool fallback_to_pager)
static inline void perf_gtk_setup_browser(bool fallback_to_pager)
{
if (fallback_to_pager)
setup_pager();
}
static inline void perf_gtk_exit_browser(bool wait_for_ok __used) {}
#else
void perf_gtk_setup_browser(int argc, const char *argv[], bool fallback_to_pager);
void perf_gtk_setup_browser(bool fallback_to_pager);
void perf_gtk_exit_browser(bool wait_for_ok);
#endif

Expand Down

0 comments on commit 7706f96

Please sign in to comment.