From: Tony Finch <fanf@isc.org>
Date: Fri, 22 Apr 2022 08:06:31 +0000 (+0100)
Subject: Remove redundant rbt macro definitions
X-Git-Tag: v9.19.1~46^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8adae2d8130d75d5a5e5d3ab2ed03a88b5a54b7c;p=thirdparty%2Fbind9.git

Remove redundant rbt macro definitions

After the previous commit, these macros are no longer used.
---

diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index cafdfeee120..e4689f65903 100644
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -76,40 +76,11 @@ struct dns_rbt {
 	uint32_t hiter;
 };
 
-#define RED   0
-#define BLACK 1
-
-/*%
- * Elements of the rbtnode structure.
- */
-#define PARENT(node)	   ((node)->parent)
-#define LEFT(node)	   ((node)->left)
-#define RIGHT(node)	   ((node)->right)
-#define DOWN(node)	   ((node)->down)
-#define UPPERNODE(node)	   ((node)->uppernode)
-#define DATA(node)	   ((node)->data)
 #define IS_EMPTY(node)	   ((node)->data == NULL)
-#define HASHNEXT(node)	   ((node)->hashnext)
-#define HASHVAL(node)	   ((node)->hashval)
-#define COLOR(node)	   ((node)->color)
-#define NAMELEN(node)	   ((node)->namelen)
-#define OLDNAMELEN(node)   ((node)->oldnamelen)
-#define OFFSETLEN(node)	   ((node)->offsetlen)
-#define ATTRS(node)	   ((node)->attributes)
-#define IS_ROOT(node)	   ((node)->is_root)
-#define FINDCALLBACK(node) ((node)->find_callback)
 
 #define WANTEMPTYDATA_OR_DATA(options, node) \
 	((options & DNS_RBTFIND_EMPTYDATA) != 0 || node->data != NULL)
 
-/*%
- * Structure elements from the rbtdb.c, not
- * used as part of the rbt.c algorithms.
- */
-#define DIRTY(node)   ((node)->dirty)
-#define WILD(node)    ((node)->wild)
-#define LOCKNUM(node) ((node)->locknum)
-
 /*%
  * The variable length stuff stored after the node has the following
  * structure.
@@ -133,10 +104,10 @@ struct dns_rbt {
 /*%
  * Color management.
  */
+#define RED   0
+#define BLACK 1
 #define IS_RED(node)	 ((node) != NULL && (node)->color == RED)
 #define IS_BLACK(node)	 ((node) == NULL || (node)->color == BLACK)
-#define MAKE_RED(node)	 ((node)->color = RED)
-#define MAKE_BLACK(node) ((node)->color = BLACK)
 
 /*%
  * Chain management.