From: Willy Tarreau <w@1wt.eu>
Date: Mon, 19 Sep 2011 18:36:45 +0000 (+0200)
Subject: CLEANUP: ebtree: remove 4-year old harmless typo in duplicates insertion code
X-Git-Tag: v1.5-dev8~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=655c84a9f0afa1b598c43f73ca86a45a8a4c4790;p=thirdparty%2Fhaproxy.git

CLEANUP: ebtree: remove 4-year old harmless typo in duplicates insertion code

(from ebtree 6.0.7)

This typo has been there since we introduced duplicates. A "struct eb_troot *"
which apparently the compiler doesn't complain about while it is never declared
anywhere. Amazing...

(cherry picked from commit 2879648db5d32cf009ae571cb0e8e1df75152281)
---

diff --git a/ebtree/ebtree.h b/ebtree/ebtree.h
index 2ec9dc7dd5..eb7d0216c9 100644
--- a/ebtree/ebtree.h
+++ b/ebtree/ebtree.h
@@ -456,9 +456,9 @@ __eb_insert_dup(struct eb_node *sub, struct eb_node *new)
 {
 	struct eb_node *head = sub;
 	
-	struct eb_troot *new_left = eb_dotag(&new->branches, EB_LEFT);
-	struct eb_troot *new_rght = eb_dotag(&new->branches, EB_RGHT);
-	struct eb_troot *new_leaf = eb_dotag(&new->branches, EB_LEAF);
+	eb_troot_t *new_left = eb_dotag(&new->branches, EB_LEFT);
+	eb_troot_t *new_rght = eb_dotag(&new->branches, EB_RGHT);
+	eb_troot_t *new_leaf = eb_dotag(&new->branches, EB_LEAF);
 
 	/* first, identify the deepest hole on the right branch */
 	while (eb_gettag(head->branches.b[EB_RGHT]) != EB_LEAF) {