dns_rdataset_* const parameters

dns_rdataset_clone() now have a const source rdataset. Also,
dns_rdataset_isassociated() also takes a const rdataset.

diff --git a/bin/named/builtin.c b/bin/named/builtin.c
index b7f07ae523f8e0b3b3cc96b806b6d773a3e1444b..c0e159cd625fedc375f1d2224b2e60731559b6c9 100644 (file)
--- a/bin/named/builtin.c
+++ b/bin/named/builtin.c
@@ -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);

diff --git a/lib/dns/include/dns/rdatalist.h b/lib/dns/include/dns/rdatalist.h
index 35e490de3860c95bd885f5b3fc9313db01b890ad..a38e5ceaf7f653c8aa8ed88d7b62f960147fb790 100644 (file)
--- a/lib/dns/include/dns/rdatalist.h
+++ b/lib/dns/include/dns/rdatalist.h
@@ -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);

diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index 17f5eff088d21c5e69135b66486165f21e3d96e9..430dc0321ca1ca4cf82aaa612c9a760b58129e03 100644 (file)
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -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'.

diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c
index 21b9e955e483f421ac4017c2c63797e4a099d051..662570c74906ff37ffcf48af4c4c54f4befcde54 100644 (file)
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -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;

diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index 54e72928fba17800fb28e7c8db8891f98567ca06..a1670e17e0c58ae7a5c48ab9702e6db91af61032 100644 (file)
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -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;

diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c
index d5b650679ec7fffffec0c20db1b86a8409522afd..6882d913dd960add695fe5fc224c9caa3532205d 100644 (file)
--- a/lib/dns/rdatalist.c
+++ b/lib/dns/rdatalist.c
@@ -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);

diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 3d629109edfcecdcebe9aeebc9c216ce030b812f..a90bb9f99e0fae3bf4e14fb9ebe9ccd49525a20c 100644 (file)
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -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'.

diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index 48ac591eebdd6a684b22b3e756cb9a223b35e385..ba56690669b6678ab426b53c017193007ac73405 100644 (file)
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -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;
 

diff --git a/lib/dns/rdatavec.c b/lib/dns/rdatavec.c
index c4672caa4e94ea3a2a8d170f2b5af073f0aca5bd..62bc189b47d68658636fdf4aeb1622f2ea31c3fd 100644 (file)
--- a/lib/dns/rdatavec.c
+++ b/lib/dns/rdatavec.c
@@ -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;
 

diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index 52f4e34005e860fd93aa7c0d62349811ea8278cb..49290aedff54106fe968eb8f8e726e5a5b3c85b8 100644 (file)
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -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);