From 4c0b329a904aaaf25416f498692d6d7316b4057d Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sat, 3 Jan 2015 17:02:12 +0000 Subject: [PATCH 1/1] rbtree.c: Remove unused rb_replace_node(). Found by cppcheck. --- rbtree.c | 23 ----------------------- rbtree.h | 4 ---- 2 files changed, 27 deletions(-) diff --git a/rbtree.c b/rbtree.c index 2b87c8b..3cad749 100644 --- a/rbtree.c +++ b/rbtree.c @@ -382,29 +382,6 @@ struct rb_node *rb_prev(const struct rb_node *node) return parent; } -void rb_replace_node(struct rb_node *victim, struct rb_node *new, - struct rb_root *root) -{ - struct rb_node *parent = rb_parent(victim); - - /* Set the surrounding nodes to point to the replacement */ - if (parent) { - if (victim == parent->rb_left) - parent->rb_left = new; - else - parent->rb_right = new; - } else { - root->rb_node = new; - } - if (victim->rb_left) - rb_set_parent(victim->rb_left, new); - if (victim->rb_right) - rb_set_parent(victim->rb_right, new); - - /* Copy the pointers/colour from the victim to the replacement */ - *new = *victim; -} - /** * Get the n-th node (in sort order) of the tree. * diff --git a/rbtree.h b/rbtree.h index 109dd85..4bf4917 100644 --- a/rbtree.h +++ b/rbtree.h @@ -154,10 +154,6 @@ extern struct rb_node *rb_last(const struct rb_root *); extern struct rb_node *rb_nth(const struct rb_node *node, unsigned n); extern int rb_rank(const struct rb_node *node, unsigned *rank); -/* Fast replacement of a single node without remove/rebalance/add/rebalance */ -extern void rb_replace_node(struct rb_node *victim, struct rb_node *new, - struct rb_root *root); - static inline void rb_link_node(struct rb_node * node, struct rb_node * parent, struct rb_node ** rb_link) { -- 2.39.2