rbtnode's callback member renamed find_callback.

lib/dns/include/dns/rbt.h

@@ -58,12 +58,12 @@ typedef struct dns_rbtnode {
 	 * In each case below the "range" indicated is what's _necessary_ for
 	 * the bitfield to hold, not what it actually _can_ hold.
 	 */
-	unsigned int color:1;	     /* range is 0..1 */
-	unsigned int callback:1;     /* range is 0..1 */
-	unsigned int attributes:5;   /* range is 0..2 */
-	unsigned int namelen:8;	     /* range is 1..255 */
-	unsigned int offsetlen:8;    /* range is 1..128 */
-	unsigned int padbytes:9;     /* range is 0..380 */
+	unsigned int color:1;	      /* range is 0..1 */
+	unsigned int find_callback:1; /* range is 0..1 */
+	unsigned int attributes:5;    /* range is 0..2 */
+	unsigned int namelen:8;	      /* range is 1..255 */
+	unsigned int offsetlen:8;     /* range is 1..128 */
+	unsigned int padbytes:9;      /* range is 0..380 */
 	/*
 	 * These values are used in the RBT DB implementation.  The appropriate
 	 * node lock must be held before accessing them.

lib/dns/rbt.c

@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: rbt.c,v 1.31 1999/04/01 03:15:53 tale Exp $ */
+/* $Id: rbt.c,v 1.32 1999/04/01 15:57:47 tale Exp $ */
 
 /* Principal Authors: DCL */
 
@@ -57,7 +57,7 @@ struct dns_rbt {
 #define DOWN(node)	((node)->down)
 #define DATA(node)	((node)->data)
 #define COLOR(node) 	((node)->color)
-#define CALLBACK(node)	((node)->callback)
+#define CALLBACK(node)	((node)->find_callback)
 #define NAMELEN(node)	((node)->namelen)
 #define OFFSETLEN(node)	((node)->offsetlen)
 #define ATTRS(node)	((node)->attributes)

lib/dns/rbtdb.c

@@ -1959,7 +1959,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 
 	result = add(rbtdb, rbtnode, rbtversion, newheader, merge, ISC_FALSE);
 	if (result == DNS_R_SUCCESS && delegating)
-		rbtnode->callback = 1;
+		rbtnode->find_callback = 1;
 
 	UNLOCK(&rbtdb->node_locks[rbtnode->locknum].lock);
 
@@ -2047,7 +2047,7 @@ add_rdataset_callback(dns_rdatacallbacks_t *callbacks, dns_name_t *name,
 		     ISC_TRUE);
 	if (result == DNS_R_SUCCESS &&
 	    delegating_type(rbtdb, node, rdataset->type))
-		node->callback = 1;
+		node->find_callback = 1;
 
 	return (result);
 }