mirror of
https://github.com/isc-projects/bind9.git
synced 2026-05-22 01:56:00 -04:00
dns_rdataset_* const parameters
dns_rdataset_clone() now have a const source rdataset. Also, dns_rdataset_isassociated() also takes a const rdataset.
This commit is contained in:
parent
40bffcc8a6
commit
d0d4b40b62
10 changed files with 27 additions and 17 deletions
|
|
@ -614,7 +614,8 @@ disassociate(dns_rdataset_t *rdataset DNS__DB_FLARG) {
|
|||
}
|
||||
|
||||
static void
|
||||
rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
rdataset_clone(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
dns_dbnode_t *node = source->rdlist.node;
|
||||
|
||||
dns__rdatalist_clone(source, target DNS__DB_FLARG_PASS);
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ dns__rdatalist_next(dns_rdataset_t *rdataset);
|
|||
void
|
||||
dns__rdatalist_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
|
||||
void
|
||||
dns__rdatalist_clone(dns_rdataset_t *source,
|
||||
dns__rdatalist_clone(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG);
|
||||
unsigned int
|
||||
dns__rdatalist_count(dns_rdataset_t *rdataset);
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ struct dns_rdatasetmethods {
|
|||
isc_result_t (*first)(dns_rdataset_t *rdataset);
|
||||
isc_result_t (*next)(dns_rdataset_t *rdataset);
|
||||
void (*current)(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
|
||||
void (*clone)(dns_rdataset_t *source,
|
||||
void (*clone)(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG);
|
||||
unsigned int (*count)(dns_rdataset_t *rdataset);
|
||||
isc_result_t (*addnoqname)(dns_rdataset_t *rdataset, dns_name_t *name);
|
||||
|
|
@ -308,7 +308,7 @@ dns__rdataset_disassociate(dns_rdataset_t *rdataset DNS__DB_FLARG);
|
|||
*/
|
||||
|
||||
bool
|
||||
dns_rdataset_isassociated(dns_rdataset_t *rdataset);
|
||||
dns_rdataset_isassociated(const dns_rdataset_t *rdataset);
|
||||
/*%<
|
||||
* Is 'rdataset' associated?
|
||||
*
|
||||
|
|
@ -340,7 +340,7 @@ dns_rdataset_makequestion(dns_rdataset_t *rdataset, dns_rdataclass_t rdclass,
|
|||
#define dns_rdataset_clone(source, target) \
|
||||
dns__rdataset_clone(source, target DNS__DB_FILELINE)
|
||||
void
|
||||
dns__rdataset_clone(dns_rdataset_t *source,
|
||||
dns__rdataset_clone(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG);
|
||||
/*%<
|
||||
* Make 'target' refer to the same rdataset as 'source'.
|
||||
|
|
|
|||
|
|
@ -89,7 +89,8 @@ keynode_next(dns_rdataset_t *rdataset);
|
|||
static void
|
||||
keynode_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
|
||||
static void
|
||||
keynode_clone(dns_rdataset_t *source, dns_rdataset_t *target DNS__DB_FLARG);
|
||||
keynode_clone(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG);
|
||||
|
||||
static dns_rdatasetmethods_t methods = {
|
||||
.disassociate = keynode_disassociate,
|
||||
|
|
@ -800,7 +801,8 @@ keynode_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
|
|||
}
|
||||
|
||||
static void
|
||||
keynode_clone(dns_rdataset_t *source, dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
keynode_clone(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
dns_keynode_t *keynode = NULL;
|
||||
|
||||
keynode = source->keytable.node;
|
||||
|
|
|
|||
|
|
@ -430,7 +430,8 @@ rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
|
|||
}
|
||||
|
||||
static void
|
||||
rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
rdataset_clone(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
*target = *source;
|
||||
target->ncache.iter_pos = NULL;
|
||||
target->ncache.iter_count = 0;
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ dns__rdatalist_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
|
|||
}
|
||||
|
||||
void
|
||||
dns__rdatalist_clone(dns_rdataset_t *source,
|
||||
dns__rdatalist_clone(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
REQUIRE(source != NULL);
|
||||
REQUIRE(target != NULL);
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ dns__rdataset_disassociate(dns_rdataset_t *rdataset DNS__DB_FLARG) {
|
|||
}
|
||||
|
||||
bool
|
||||
dns_rdataset_isassociated(dns_rdataset_t *rdataset) {
|
||||
dns_rdataset_isassociated(const dns_rdataset_t *rdataset) {
|
||||
/*
|
||||
* Is 'rdataset' associated?
|
||||
*/
|
||||
|
|
@ -120,7 +120,8 @@ question_cursor(dns_rdataset_t *rdataset ISC_ATTR_UNUSED) {
|
|||
}
|
||||
|
||||
static void
|
||||
question_clone(dns_rdataset_t *source, dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
question_clone(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
*target = *source;
|
||||
}
|
||||
|
||||
|
|
@ -161,7 +162,7 @@ dns_rdataset_count(dns_rdataset_t *rdataset) {
|
|||
}
|
||||
|
||||
void
|
||||
dns__rdataset_clone(dns_rdataset_t *source,
|
||||
dns__rdataset_clone(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
/*
|
||||
* Make 'target' refer to the same rdataset as 'source'.
|
||||
|
|
|
|||
|
|
@ -61,7 +61,8 @@ rdataset_next(dns_rdataset_t *rdataset);
|
|||
static void
|
||||
rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
|
||||
static void
|
||||
rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target DNS__DB_FLARG);
|
||||
rdataset_clone(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG);
|
||||
static unsigned int
|
||||
rdataset_count(dns_rdataset_t *rdataset);
|
||||
static isc_result_t
|
||||
|
|
@ -985,7 +986,8 @@ rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
|
|||
}
|
||||
|
||||
static void
|
||||
rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
rdataset_clone(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
dns_dbnode_t *node = source->slab.node;
|
||||
dns_dbnode_t *cloned_node = NULL;
|
||||
|
||||
|
|
|
|||
|
|
@ -69,7 +69,8 @@ rdataset_next(dns_rdataset_t *rdataset);
|
|||
static void
|
||||
rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
|
||||
static void
|
||||
rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target DNS__DB_FLARG);
|
||||
rdataset_clone(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG);
|
||||
static unsigned int
|
||||
rdataset_count(dns_rdataset_t *rdataset);
|
||||
static void
|
||||
|
|
@ -934,7 +935,8 @@ rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
|
|||
}
|
||||
|
||||
static void
|
||||
rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
rdataset_clone(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
dns_dbnode_t *node = source->vec.node;
|
||||
dns_dbnode_t *cloned_node = NULL;
|
||||
|
||||
|
|
|
|||
|
|
@ -1219,7 +1219,8 @@ disassociate(dns_rdataset_t *rdataset DNS__DB_FLARG) {
|
|||
}
|
||||
|
||||
static void
|
||||
rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
rdataset_clone(const dns_rdataset_t *source,
|
||||
dns_rdataset_t *target DNS__DB_FLARG) {
|
||||
dns_dbnode_t *node = source->rdlist.node;
|
||||
|
||||
dns__rdatalist_clone(source, target DNS__DB_FLARG_PASS);
|
||||
|
|
|
|||
Loading…
Reference in a new issue