use tlsa and smime structs to set common values

diff --git a/lib/dns/rdata/generic/smimea_53.c b/lib/dns/rdata/generic/smimea_53.c
index a7e7954a3e901e8d403bba8c276f1cb390ef641c..9c69d547a78853920e7084d5567d4915593d1414 100644 (file)
--- a/lib/dns/rdata/generic/smimea_53.c
+++ b/lib/dns/rdata/generic/smimea_53.c
@@ -79,24 +79,24 @@ fromstruct_smimea(ARGS_FROMSTRUCT) {
 
 static inline isc_result_t
 tostruct_smimea(ARGS_TOSTRUCT) {
-       dns_rdata_txt_t *txt = target;
+       dns_rdata_smimea_t *smimea = target;
 
        REQUIRE(rdata->type == dns_rdatatype_smimea);
        REQUIRE(target != NULL);
 
-       txt->common.rdclass = rdata->rdclass;
-       txt->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&txt->common, link);
+       smimea->common.rdclass = rdata->rdclass;
+       smimea->common.rdtype = rdata->type;
+       ISC_LINK_INIT(&smimea->common, link);
 
        return (generic_tostruct_tlsa(rdata, target, mctx));
 }
 
 static inline void
 freestruct_smimea(ARGS_FREESTRUCT) {
-       dns_rdata_txt_t *txt = source;
+       dns_rdata_smimea_t *smimea = source;
 
        REQUIRE(source != NULL);
-       REQUIRE(txt->common.rdtype == dns_rdatatype_smimea);
+       REQUIRE(smimea->common.rdtype == dns_rdatatype_smimea);
 
        generic_freestruct_tlsa(source);
 }

diff --git a/lib/dns/rdata/generic/tlsa_52.c b/lib/dns/rdata/generic/tlsa_52.c
index 079bcb1de868eb90228ba335b4447a049d5e797c..fb0dd18e9df4b6fa982005ecf38eda5f8b69abc6 100644 (file)
--- a/lib/dns/rdata/generic/tlsa_52.c
+++ b/lib/dns/rdata/generic/tlsa_52.c
@@ -257,24 +257,24 @@ fromstruct_tlsa(ARGS_FROMSTRUCT) {
 
 static inline isc_result_t
 tostruct_tlsa(ARGS_TOSTRUCT) {
-       dns_rdata_txt_t *txt = target;
+       dns_rdata_tlsa_t *tlsa = target;
 
        REQUIRE(rdata->type == dns_rdatatype_tlsa);
        REQUIRE(target != NULL);
 
-       txt->common.rdclass = rdata->rdclass;
-       txt->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&txt->common, link);
+       tlsa->common.rdclass = rdata->rdclass;
+       tlsa->common.rdtype = rdata->type;
+       ISC_LINK_INIT(&tlsa->common, link);
 
        return (generic_tostruct_tlsa(rdata, target, mctx));
 }
 
 static inline void
 freestruct_tlsa(ARGS_FREESTRUCT) {
-       dns_rdata_txt_t *txt = source;
+       dns_rdata_tlsa_t *tlsa = source;
 
        REQUIRE(source != NULL);
-       REQUIRE(txt->common.rdtype == dns_rdatatype_tlsa);
+       REQUIRE(tlsa->common.rdtype == dns_rdatatype_tlsa);
 
        generic_freestruct_tlsa(source);
 }