Skip to contentSkip to conversation

perf intlist: Rename for_each() macros to for_each_entry()

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jun 26, 2016 perf events

lore
Share & tools
lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot
#0 lore raw
Commit-ID:  10daf4d01bad77c6ae862367ad2148a8340d94e6
Gitweb:     http://git.kernel.org/tip/10daf4d01bad77c6ae862367ad2148a8340d94e6
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 23 Jun 2016 11:39:19 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 23 Jun 2016 11:39:19 -0300

perf intlist: Rename for_each() macros to for_each_entry()

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

Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Milian Wolff <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Taeung Song <[email protected]>
Cc Wang Nan <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/util/intlist.h     | 8 ++++----
 tools/perf/util/probe-event.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
tools/perf/util/intlist.h +4 -4
index aa6877d..020b9ca 100644
@@ -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 */
tools/perf/util/probe-event.c +1 -1
index 4f7b3e5..55f41d5 100644
@@ -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)