Declare the 'rdata' argument for dns_rdata_tostruct() to be const

(cherry picked from commit abb2fd1027c248dfa0bebcf6882fb74327ca77fa)

diff --git a/CHANGES b/CHANGES
index 5a6da35ebf5ddca480d9c8b60606b11f03b180b5..470bb58b45b3ef3a9ff27715b534394d51518849 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4972.  [func]          Declare the 'rdata' argument for dns_rdata_tostruct()
+                       to be const. [GL #341]
+
 4971.  [bug]           dnssec-signzone and dnssec-verify did not treat records
                        below a DNAME as out-of-zone data. [GL #298]
 

diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index 7737e5c5da3696567f98416aadfa54048c910ad2..29f4e69f84cbeb33635945b31d852c4b926fc3aa 100644 (file)
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -497,7 +497,7 @@ dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
  */
 
 isc_result_t
-dns_rdata_tostruct(dns_rdata_t *rdata, void *target, isc_mem_t *mctx);
+dns_rdata_tostruct(const dns_rdata_t *rdata, void *target, isc_mem_t *mctx);
 /*%<
  * Convert an rdata into its C structure representation.
  *

diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 956b9df32eb27e242b29568fe18e76ca8d94e11e..57d31cea9012b21bba6cb57cad42692bb0a78c63 100644 (file)
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -95,7 +95,7 @@
 #define ARGS_FROMSTRUCT        int rdclass, dns_rdatatype_t type, \
                        void *source, isc_buffer_t *target
 
-#define ARGS_TOSTRUCT  dns_rdata_t *rdata, void *target, isc_mem_t *mctx
+#define ARGS_TOSTRUCT  const dns_rdata_t *rdata, void *target, isc_mem_t *mctx
 
 #define ARGS_FREESTRUCT void *source
 
@@ -1202,7 +1202,7 @@ dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
 }
 
 isc_result_t
-dns_rdata_tostruct(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
+dns_rdata_tostruct(const dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
        isc_result_t result = ISC_R_NOTIMPLEMENTED;
        isc_boolean_t use_default = ISC_FALSE;