mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Merge branch '341-constify-dns_rdata_tostruct' into 'master'

Browse Source 
Resolve "constify dns_rdata_tostruct"

Closes #341

See merge request isc-projects/bind9!378
This commit is contained in:
Michał Kępień
2018-06-15 02:57:54 -04:00
parent 3668e152bb abb2fd1027
commit c37537cfe7
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -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 4971. [bug] dnssec-signzone and dnssec-verify did not treat records
below a DNAME as out-of-zone data. [GL #298] below a DNAME as out-of-zone data. [GL #298]

2
lib/dns/include/dns/rdata.h
View File

@@ -501,7 +501,7 @@ dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
*/ */
isc_result_t 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. * Convert an rdata into its C structure representation.
* *

4
lib/dns/rdata.c
View File

@@ -95,7 +95,7 @@
#define ARGS_FROMSTRUCT int rdclass, dns_rdatatype_t type, \ #define ARGS_FROMSTRUCT int rdclass, dns_rdatatype_t type, \
void *source, isc_buffer_t *target 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 #define ARGS_FREESTRUCT void *source
@@ -1185,7 +1185,7 @@ dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
} }
isc_result_t 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_result_t result = ISC_R_NOTIMPLEMENTED;
isc_boolean_t use_default = ISC_FALSE; isc_boolean_t use_default = ISC_FALSE;