mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

Made calls to dns_rbt_find{name,node} compatible with the just-committed

Browse Source 
changes to rbt.c by passing a NULL pointer for the dns_name_t that
receives the full name of the node that is found.  There is probably something
better to do, but this just keeps things compiling.
This commit is contained in:
David Lawrence 1999-03-16 16:15:44 +00:00
parent 194f54f4da
commit eca5913a47
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/dns/compress.c
View File

@ -15,7 +15,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* $Id: compress.c,v 1.7 1999/03/11 00:26:20 marka Exp $ */ /* $Id: compress.c,v 1.8 1999/03/16 16:15:44 tale Exp $ */
#include <config.h> #include <config.h>
@ -447,10 +447,13 @@ compress_find(dns_rbt_t *root, dns_name_t *name, dns_name_t *prefix,
while (count > 1) { while (count > 1) {
dns_name_getlabelsequence(name, start, count, &tmpname); dns_name_getlabelsequence(name, start, count, &tmpname);
data = NULL; data = NULL;
result = dns_rbt_findname(root, &tmpname, (void *)&data); result = dns_rbt_findname(root, &tmpname, NULL, (void *)&data);
/* XXX @@@ is this right, Mark? /* XXX @@@ is this right, Mark?
note that for data to be non-null, then result can note that for data to be non-null, then result can
be DNS_R_SUCCESS or DNS_R_PARTIALMATCH */ be DNS_R_SUCCESS or DNS_R_PARTIALMATCH
XXX @@@ third argument to findname is a name with a fixed
buffer (eg, a dns_fixedname_name()).
*/
if (result == DNS_R_SUCCESS && data != NULL) if (result == DNS_R_SUCCESS && data != NULL)
break; break;
count--; count--;
@ -482,8 +485,11 @@ compress_find(dns_rbt_t *root, dns_name_t *name, dns_name_t *prefix,
if (result != DNS_R_SUCCESS) if (result != DNS_R_SUCCESS)
continue; continue;
data = NULL; data = NULL;
result = dns_rbt_findname(root, &tmpname, (void *)&data); result = dns_rbt_findname(root, &tmpname, NULL,
/* XXX @@@ is this right, Mark? */ (void *)&data);
/* XXX @@@ is this right, Mark?
XXX @@@ modify third arg for foundname?
*/
if (result == DNS_R_SUCCESS && data != NULL) if (result == DNS_R_SUCCESS && data != NULL)
break; break;
if (bits == 1) if (bits == 1)

2
lib/dns/rbtdb.c
View File

@ -719,7 +719,7 @@ findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create,
dns_name_init(&foundname, NULL); dns_name_init(&foundname, NULL);
RWLOCK(&rbtdb->tree_lock, locktype); RWLOCK(&rbtdb->tree_lock, locktype);
result = dns_rbt_findnode(rbtdb->tree, name, &node, NULL); result = dns_rbt_findnode(rbtdb->tree, name, NULL, &node, NULL);
again: again:
if (result == DNS_R_SUCCESS) { if (result == DNS_R_SUCCESS) {
locknum = node->locknum; locknum = node->locknum;