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

Use dns_fixedname_initname() where possible

Browse Source 
Replace dns_fixedname_init() calls followed by dns_fixedname_name()
calls with calls to dns_fixedname_initname() where it is possible
without affecting current behavior and/or performance.

This patch was mostly prepared using Coccinelle and the following
semantic patch:

    @@
    expression fixedname, name;
    @@
    -	dns_fixedname_init(&fixedname);
    	...
    -	name = dns_fixedname_name(&fixedname);
    +	name = dns_fixedname_initname(&fixedname);

The resulting set of changes was then manually reviewed to exclude false
positives and apply minor tweaks.

It is likely that more occurrences of this pattern can be refactored in
an identical way.  This commit only takes care of the low-hanging fruit.
This commit is contained in:
Michał Kępień
2018-03-28 14:38:09 +02:00
committed by Ondřej Surý
parent 0d2a03c290
commit 4df4a8e731
86 changed files with 335 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lib/dns/rbtdb.c
View File

@@ -1973,15 +1973,13 @@ delete_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) {
* Though this may be wasteful, it has to be done before
* node is deleted.
*/
dns_fixedname_init(&fname);
name = dns_fixedname_name(&fname);
name = dns_fixedname_initname(&fname);
dns_rbt_fullnamefromnode(node, name);
result = dns_rbt_deletenode(rbtdb->tree, node, ISC_FALSE);
break;
case DNS_RBT_NSEC_HAS_NSEC:
dns_fixedname_init(&fname);
name = dns_fixedname_name(&fname);
name = dns_fixedname_initname(&fname);
dns_rbt_fullnamefromnode(node, name);
/*
* Delete the corresponding node from the auxiliary NSEC
@@ -3496,10 +3494,8 @@ activeempty(rbtdb_search_t *search, dns_rbtnodechain_t *chain,
rbtdb = search->rbtdb;
dns_name_init(&prefix, NULL);
dns_fixedname_init(&fnext);
next = dns_fixedname_name(&fnext);
dns_fixedname_init(&forigin);
origin = dns_fixedname_name(&forigin);
next = dns_fixedname_initname(&fnext);
origin = dns_fixedname_initname(&forigin);
result = dns_rbtnodechain_next(chain, NULL, NULL);
while (result == ISC_R_SUCCESS || result == DNS_R_NEWORIGIN) {
@@ -3558,12 +3554,9 @@ activeemtpynode(rbtdb_search_t *search, const dns_name_t *qname,
dns_name_init(&name, NULL);
dns_name_init(&tname, NULL);
dns_name_init(&rname, NULL);
dns_fixedname_init(&fnext);
next = dns_fixedname_name(&fnext);
dns_fixedname_init(&fprev);
prev = dns_fixedname_name(&fprev);
dns_fixedname_init(&forigin);
origin = dns_fixedname_name(&forigin);
next = dns_fixedname_initname(&fnext);
prev = dns_fixedname_initname(&fprev);
origin = dns_fixedname_initname(&forigin);
/*
* Find if qname is at or below a empty node.
@@ -3717,8 +3710,7 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep,
*/
dns_name_init(&name, NULL);
dns_rbt_namefromnode(node, &name);
dns_fixedname_init(&fwname);
wname = dns_fixedname_name(&fwname);
wname = dns_fixedname_initname(&fwname);
result = dns_name_concatenate(dns_wildcardname, &name,
wname, NULL);
j = i;
@@ -3872,8 +3864,7 @@ previous_closest_nsec(dns_rdatatype_t type, rbtdb_search_t *search,
return (result);
}
dns_fixedname_init(&ftarget);
target = dns_fixedname_name(&ftarget);
target = dns_fixedname_initname(&ftarget);
for (;;) {
if (*firstp) {
@@ -3994,10 +3985,8 @@ find_closest_nsec(rbtdb_search_t *search, dns_dbnode_t **nodep,
* Use the auxiliary tree only starting with the second node in the
* hope that the original node will be right much of the time.
*/
dns_fixedname_init(&fname);
name = dns_fixedname_name(&fname);
dns_fixedname_init(&forigin);
origin = dns_fixedname_name(&forigin);
name = dns_fixedname_initname(&fname);
origin = dns_fixedname_initname(&forigin);
again:
node = NULL;
prevnode = NULL;
@@ -4976,10 +4965,8 @@ find_coveringnsec(rbtdb_search_t *search, dns_dbnode_t **nodep,
do {
node = NULL;
dns_fixedname_init(&fname);
name = dns_fixedname_name(&fname);
dns_fixedname_init(&forigin);
origin = dns_fixedname_name(&forigin);
name = dns_fixedname_initname(&fname);
origin = dns_fixedname_initname(&forigin);
result = dns_rbtnodechain_current(&chain, name, origin, &node);
if (result != ISC_R_SUCCESS)
return (result);
@@ -6838,8 +6825,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
if (result != ISC_R_SUCCESS)
return (result);
dns_fixedname_init(&fixed);
name = dns_fixedname_name(&fixed);
name = dns_fixedname_initname(&fixed);
RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
dns_rbt_fullnamefromnode(node, name);
RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
@@ -10113,13 +10099,11 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) {
ctx = (rbtdb_glue_additionaldata_ctx_t *) arg;
dns_fixedname_init(&fixedname_a);
name_a = dns_fixedname_name(&fixedname_a);
name_a = dns_fixedname_initname(&fixedname_a);
dns_rdataset_init(&rdataset_a);
dns_rdataset_init(&sigrdataset_a);
dns_fixedname_init(&fixedname_aaaa);
name_aaaa = dns_fixedname_name(&fixedname_aaaa);
name_aaaa = dns_fixedname_initname(&fixedname_aaaa);
dns_rdataset_init(&rdataset_aaaa);
dns_rdataset_init(&sigrdataset_aaaa);
@@ -10134,8 +10118,7 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) {
goto out;
}
dns_fixedname_init(&glue->fixedname);
gluename = dns_fixedname_name(&glue->fixedname);
gluename = dns_fixedname_initname(&glue->fixedname);
dns_name_copy(name_a, gluename, NULL);
dns_rdataset_init(&glue->rdataset_a);
@@ -10163,8 +10146,7 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) {
goto out;
}
dns_fixedname_init(&glue->fixedname);
gluename = dns_fixedname_name(&glue->fixedname);
gluename = dns_fixedname_initname(&glue->fixedname);
dns_name_copy(name_aaaa, gluename, NULL);
dns_rdataset_init(&glue->rdataset_a);