From 1d71f56114adb4c5c678720097276a81d5b29e3a Mon Sep 17 00:00:00 2001 From: "Suzuki K. Poulose" Date: Fri, 31 Aug 2012 12:39:18 +0530 Subject: [PATCH] --- yaml --- r: 338889 b: refs/heads/master c: 03f2f93ae00762eb881424df1c688d034fd341ee h: refs/heads/master i: 338887: 2de9460522f8ed6104f9aad6233d6b201ef9f7de v: v3 --- [refs] | 2 +- trunk/tools/perf/util/rblist.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a9c59c38af79..728c02c3e703 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68e94f4eb56d92ccb617a98fcac5e575702ec4fd +refs/heads/master: 03f2f93ae00762eb881424df1c688d034fd341ee diff --git a/trunk/tools/perf/util/rblist.c b/trunk/tools/perf/util/rblist.c index 0171fb611004..a16cdd2625ad 100644 --- a/trunk/tools/perf/util/rblist.c +++ b/trunk/tools/perf/util/rblist.c @@ -44,6 +44,7 @@ int rblist__add_node(struct rblist *rblist, const void *new_entry) void rblist__remove_node(struct rblist *rblist, struct rb_node *rb_node) { rb_erase(rb_node, &rblist->entries); + --rblist->nr_entries; rblist->node_delete(rblist, rb_node); } @@ -87,8 +88,7 @@ void rblist__delete(struct rblist *rblist) while (next) { pos = next; next = rb_next(pos); - rb_erase(pos, &rblist->entries); - rblist->node_delete(rblist, pos); + rblist__remove_node(rblist, pos); } free(rblist); }