From: Mark Andrews <marka@isc.org>
Date: Fri, 15 Jun 2018 01:48:27 +0000 (+1000)
Subject: Declare the 'rdata' argument for dns_rdata_tostruct() to be const
X-Git-Tag: v9.12.2rc2~16^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d4c55dae8e8eee6f316b1344babda37336156972;p=thirdparty%2Fbind9.git

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

(cherry picked from commit abb2fd1027c248dfa0bebcf6882fb74327ca77fa)
---

diff --git a/CHANGES b/CHANGES
index cc8fc845ede..c6250e81376 100644
--- 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 969e5fa7b98..a487428fb4d 100644
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -501,7 +501,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 ad8f128a99e..2dfcffe411d 100644
--- 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
 
@@ -1205,7 +1205,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;