perf probe: Replace line_list with intlist

Replace line_list (struct line_node) with intlist for reducing similar
codes.

Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053209.29635.81043.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 10 insertions, 12 deletions

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index a4649e7449c5..f70fd08f00b7 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -561,7 +561,7 @@ static int _show_one_line(FILE *fp, int l, bool skip, bool show_num)
 static int __show_line_range(struct line_range *lr, const char *module)
 {
         int l = 1;
-        struct line_node *ln;
+        struct int_node *ln;
         struct debuginfo *dinfo;
         FILE *fp;
         int ret;
@@ -614,8 +614,8 @@ static int __show_line_range(struct line_range *lr, const char *module)
                         goto end;
         }
 
-        list_for_each_entry(ln, &lr->line_list, list) {
-                for (; ln->line > l; l++) {
+        intlist__for_each(ln, lr->line_list) {
+                for (; ln->i > l; l++) {
                         ret = show_one_line(fp, l - lr->offset);
                         if (ret < 0)
                                 goto end;
@@ -775,24 +775,22 @@ int show_available_vars(struct perf_probe_event *pevs __maybe_unused,
 
 void line_range__clear(struct line_range *lr)
 {
-        struct line_node *ln;
-
         free(lr->function);
         free(lr->file);
         free(lr->path);
         free(lr->comp_dir);
-        while (!list_empty(&lr->line_list)) {
-                ln = list_first_entry(&lr->line_list, struct line_node, list);
-                list_del(&ln->list);
-                free(ln);
-        }
+        intlist__delete(lr->line_list);
         memset(lr, 0, sizeof(*lr));
 }
 
-void line_range__init(struct line_range *lr)
+int line_range__init(struct line_range *lr)
 {
         memset(lr, 0, sizeof(*lr));
-        INIT_LIST_HEAD(&lr->line_list);
+        lr->line_list = intlist__new(NULL);
+        if (!lr->line_list)
+                return -ENOMEM;
+        else
+                return 0;
 }
 
 static int parse_line_num(char **ptr, int *val, const char *what)