lkml.org 
[lkml]   [2012]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/7] perf ui: Drop arg[cv] arguments from perf_gtk_setup_browser()
    Date
    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().

    Acked-by: Pekka Enberg <penberg@kernel.org>
    Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
    ---
    tools/perf/builtin-report.c | 2 +-
    tools/perf/ui/gtk/browser.c | 5 ++---
    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 2e317438980b..50a05739091d 100644
    --- a/tools/perf/builtin-report.c
    +++ b/tools/perf/builtin-report.c
    @@ -675,7 +675,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 {
    diff --git a/tools/perf/ui/gtk/browser.c b/tools/perf/ui/gtk/browser.c
    index d48cef877c96..0112dcbd6e52 100644
    --- a/tools/perf/ui/gtk/browser.c
    +++ b/tools/perf/ui/gtk/browser.c
    @@ -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)
    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);
    #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

    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-03-29 08:39    [W:0.042 / U:0.516 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site