Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7706f966 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarNamhyung Kim <namhyung.kim@lge.com>
Acked-by: default avatarPekka 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ca09b2e1

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {

tools/perf/ui/gtk/browser.c

+2 −3
Original line number Diff line number Diff line
@@ -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)

tools/perf/util/cache.h

+2 −2
Original line number Diff line number Diff line
@@ -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