lkml.org 
[lkml]   [2016]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 22/27] perf intlist: Rename for_each() macros to for_each_entry()
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    To match the semantics for list.h in the kernel, that are the
    interface we use in them.

    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Milian Wolff <milian.wolff@kdab.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Taeung Song <treeze.taeung@gmail.com>
    Cc: Wang Nan <wangnan0@huawei.com>
    Link: http://lkml.kernel.org/n/tip-mdp1heu9xjjc12zebh91232l@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/intlist.h | 8 ++++----
    tools/perf/util/probe-event.c | 2 +-
    2 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/tools/perf/util/intlist.h b/tools/perf/util/intlist.h
    index aa6877d36858..020b9ca1b47e 100644
    --- a/tools/perf/util/intlist.h
    +++ b/tools/perf/util/intlist.h
    @@ -57,21 +57,21 @@ static inline struct int_node *intlist__next(struct int_node *in)
    }

    /**
    - * intlist_for_each - iterate over a intlist
    + * intlist__for_each_entry - iterate over a intlist
    * @pos: the &struct int_node to use as a loop cursor.
    * @ilist: the &struct intlist for loop.
    */
    -#define intlist__for_each(pos, ilist) \
    +#define intlist__for_each_entry(pos, ilist) \
    for (pos = intlist__first(ilist); pos; pos = intlist__next(pos))

    /**
    - * intlist_for_each_safe - iterate over a intlist safe against removal of
    + * intlist__for_each_entry_safe - iterate over a intlist safe against removal of
    * int_node
    * @pos: the &struct int_node to use as a loop cursor.
    * @n: another &struct int_node to use as temporary storage.
    * @ilist: the &struct intlist for loop.
    */
    -#define intlist__for_each_safe(pos, n, ilist) \
    +#define intlist__for_each_entry_safe(pos, n, ilist) \
    for (pos = intlist__first(ilist), n = intlist__next(pos); pos;\
    pos = n, n = intlist__next(n))
    #endif /* __PERF_INTLIST_H */
    diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
    index 4f7b3e5e355d..55f41d5e20d1 100644
    --- a/tools/perf/util/probe-event.c
    +++ b/tools/perf/util/probe-event.c
    @@ -896,7 +896,7 @@ static int __show_line_range(struct line_range *lr, const char *module,
    goto end;
    }

    - intlist__for_each(ln, lr->line_list) {
    + intlist__for_each_entry(ln, lr->line_list) {
    for (; ln->i > l; l++) {
    ret = show_one_line(fp, l - lr->offset);
    if (ret < 0)
    --
    2.5.5
    \
     
     \ /
      Last update: 2016-06-24 00:21    [W:5.405 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site