upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-04-22 14:49:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns_name_concatenate(foo, NULL, bar, NULL) -> dns_name_copy(foo, bar, NULL)

Browse source
This commit is contained in:
Brian Wellington 2001-02-05 19:47:05 +00:00
parent 71d2d34e98
commit b7cd261f2f
4 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/dns/adb.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: adb.c,v 1.168 2001/01/30 05:56:58 gson Exp $ */
/* $Id: adb.c,v 1.169 2001/02/05 19:47:01 bwelling Exp $ */
/*
* Implementation notes
@ -2730,8 +2730,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action,
find->partial_result |= (adbname->partial_result & wanted_addresses);
if (alias) {
if (target != NULL) {
result = dns_name_concatenate(&adbname->target, NULL,
target, NULL);
result = dns_name_copy(&adbname->target, target, NULL);
if (result != ISC_R_SUCCESS)
goto out;
}

8
lib/dns/lookup.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: lookup.c,v 1.8 2001/01/09 21:51:00 bwelling Exp $ */
/* $Id: lookup.c,v 1.9 2001/02/05 19:47:03 bwelling Exp $ */
#include <config.h>
@ -269,8 +269,7 @@ lookup_find(dns_lookup_t *lookup, dns_fetchevent_t *event) {
dns_rdata_reset(&rdata);
if (result != ISC_R_SUCCESS)
break;
result = dns_name_concatenate(&cname.cname, NULL, name,
NULL);
result = dns_name_copy(&cname.cname, name, NULL);
dns_rdata_freestruct(&cname);
if (result == ISC_R_SUCCESS)
want_restart = ISC_TRUE;
@ -417,8 +416,7 @@ dns_lookup_create(isc_mem_t *mctx, dns_name_t *name, dns_rdatatype_t type,
dns_fixedname_init(&lookup->name);
result = dns_name_concatenate(name, NULL,
dns_fixedname_name(&lookup->name), NULL);
result = dns_name_copy(name, dns_fixedname_name(&lookup->name), NULL);
if (result != ISC_R_SUCCESS)
goto cleanup_lock;

9
lib/dns/sdb.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: sdb.c,v 1.24 2001/01/09 21:51:32 bwelling Exp $ */
/* $Id: sdb.c,v 1.25 2001/02/05 19:47:04 bwelling Exp $ */
#include <config.h>
@ -836,7 +836,7 @@ find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
if (foundname != NULL) {
isc_result_t xresult;
xresult = dns_name_concatenate(xname, NULL, foundname, NULL);
xresult = dns_name_copy(xname, foundname, NULL);
if (xresult != ISC_R_SUCCESS) {
destroynode(node);
if (dns_rdataset_isassociated(rdataset))
@ -1338,8 +1338,7 @@ dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep,
attachnode(iterator->db, sdbiter->current, nodep);
if (name != NULL)
return (dns_name_concatenate(sdbiter->current->name, NULL,
name, NULL));
return (dns_name_copy(sdbiter->current->name, name, NULL));
return (ISC_R_SUCCESS);
}
@ -1352,7 +1351,7 @@ dbiterator_pause(dns_dbiterator_t *iterator) {
static isc_result_t
dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) {
UNUSED(iterator);
return (dns_name_concatenate(dns_rootname, NULL, name, NULL));
return (dns_name_copy(dns_rootname, name, NULL));
}
/*

7
lib/dns/view.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: view.c,v 1.94 2001/02/01 21:29:38 marka Exp $ */
/* $Id: view.c,v 1.95 2001/02/05 19:47:05 bwelling Exp $ */
#include <config.h>
@ -914,8 +914,7 @@ dns_view_findzonecut(dns_view_t *view, dns_name_t *name, dns_name_t *fname,
* We found an answer, but the cache may be better.
*/
zfname = dns_fixedname_name(&zfixedname);
result = dns_name_concatenate(fname, NULL, zfname,
NULL);
result = dns_name_copy(fname, zfname, NULL);
if (result != ISC_R_SUCCESS)
goto cleanup;
dns_rdataset_clone(rdataset, &zrdataset);
@ -971,7 +970,7 @@ dns_view_findzonecut(dns_view_t *view, dns_name_t *name, dns_name_t *fname,
dns_rdataset_isassociated(sigrdataset))
dns_rdataset_disassociate(sigrdataset);
}
result = dns_name_concatenate(zfname, NULL, fname, NULL);
result = dns_name_copy(zfname, fname, NULL);
if (result != ISC_R_SUCCESS)
goto cleanup;
dns_rdataset_clone(&zrdataset, rdataset);