From: Willy Tarreau <w@1wt.eu>
Date: Mon, 19 Sep 2011 18:48:00 +0000 (+0200)
Subject: CLEANUP: ebtree: remove another typo, a wrong initialization in insertion code
X-Git-Tag: v1.5-dev8~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6258f7b883ba3b9dd15a71d17cb8323301283a47;p=thirdparty%2Fhaproxy.git

CLEANUP: ebtree: remove another typo, a wrong initialization in insertion code

(from ebtree 6.0.7)

root_right was wrongly initialized first to <root> which is not the same
type, to be later initialized to root->b[EB_RGHT].

Let's simply remove the wrong and useless initialization.
(cherry picked from commit e63a0c2f56369b52c4d00221d83c2c4569605c06)
---

diff --git a/ebtree/eb32tree.h b/ebtree/eb32tree.h
index 83d2c53113..f36f09a024 100644
--- a/ebtree/eb32tree.h
+++ b/ebtree/eb32tree.h
@@ -229,7 +229,7 @@ __eb32_insert(struct eb_root *root, struct eb32_node *new) {
 	unsigned int side;
 	eb_troot_t *troot, **up_ptr;
 	u32 newkey; /* caching the key saves approximately one cycle */
-	eb_troot_t *root_right = root;
+	eb_troot_t *root_right;
 	eb_troot_t *new_left, *new_rght;
 	eb_troot_t *new_leaf;
 	int old_node_bit;
@@ -361,7 +361,7 @@ __eb32i_insert(struct eb_root *root, struct eb32_node *new) {
 	unsigned int side;
 	eb_troot_t *troot, **up_ptr;
 	int newkey; /* caching the key saves approximately one cycle */
-	eb_troot_t *root_right = root;
+	eb_troot_t *root_right;
 	eb_troot_t *new_left, *new_rght;
 	eb_troot_t *new_leaf;
 	int old_node_bit;
diff --git a/ebtree/eb64tree.h b/ebtree/eb64tree.h
index e5825f01e4..b97e0c41e6 100644
--- a/ebtree/eb64tree.h
+++ b/ebtree/eb64tree.h
@@ -225,7 +225,7 @@ __eb64_insert(struct eb_root *root, struct eb64_node *new) {
 	unsigned int side;
 	eb_troot_t *troot;
 	u64 newkey; /* caching the key saves approximately one cycle */
-	eb_troot_t *root_right = root;
+	eb_troot_t *root_right;
 	int old_node_bit;
 
 	side = EB_LEFT;
@@ -401,7 +401,7 @@ __eb64i_insert(struct eb_root *root, struct eb64_node *new) {
 	unsigned int side;
 	eb_troot_t *troot;
 	u64 newkey; /* caching the key saves approximately one cycle */
-	eb_troot_t *root_right = root;
+	eb_troot_t *root_right;
 	int old_node_bit;
 
 	side = EB_LEFT;
diff --git a/ebtree/ebimtree.h b/ebtree/ebimtree.h
index 685e9402bd..b40e490b4e 100644
--- a/ebtree/ebimtree.h
+++ b/ebtree/ebimtree.h
@@ -136,7 +136,7 @@ __ebim_insert(struct eb_root *root, struct ebpt_node *new, unsigned int len)
 	struct ebpt_node *old;
 	unsigned int side;
 	eb_troot_t *troot;
-	eb_troot_t *root_right = root;
+	eb_troot_t *root_right;
 	int diff;
 	int bit;
 	int old_node_bit;
diff --git a/ebtree/ebistree.h b/ebtree/ebistree.h
index ded5cb13e6..cfa0de03ce 100644
--- a/ebtree/ebistree.h
+++ b/ebtree/ebistree.h
@@ -131,7 +131,7 @@ __ebis_insert(struct eb_root *root, struct ebpt_node *new)
 	struct ebpt_node *old;
 	unsigned int side;
 	eb_troot_t *troot;
-	eb_troot_t *root_right = root;
+	eb_troot_t *root_right;
 	int diff;
 	int bit;
 	int old_node_bit;
diff --git a/ebtree/ebmbtree.h b/ebtree/ebmbtree.h
index 8d1e4e5afe..121c59fa12 100644
--- a/ebtree/ebmbtree.h
+++ b/ebtree/ebmbtree.h
@@ -216,7 +216,7 @@ __ebmb_insert(struct eb_root *root, struct ebmb_node *new, unsigned int len)
 	struct ebmb_node *old;
 	unsigned int side;
 	eb_troot_t *troot, **up_ptr;
-	eb_troot_t *root_right = root;
+	eb_troot_t *root_right;
 	int diff;
 	int bit;
 	eb_troot_t *new_left, *new_rght;
@@ -554,7 +554,7 @@ __ebmb_insert_prefix(struct eb_root *root, struct ebmb_node *new, unsigned int l
 	struct ebmb_node *old;
 	unsigned int side;
 	eb_troot_t *troot, **up_ptr;
-	eb_troot_t *root_right = root;
+	eb_troot_t *root_right;
 	int diff;
 	int bit;
 	eb_troot_t *new_left, *new_rght;
diff --git a/ebtree/ebsttree.h b/ebtree/ebsttree.h
index fefade50cc..511fb7af7b 100644
--- a/ebtree/ebsttree.h
+++ b/ebtree/ebsttree.h
@@ -128,7 +128,7 @@ __ebst_insert(struct eb_root *root, struct ebmb_node *new)
 	struct ebmb_node *old;
 	unsigned int side;
 	eb_troot_t *troot;
-	eb_troot_t *root_right = root;
+	eb_troot_t *root_right;
 	int diff;
 	int bit;
 	int old_node_bit;