Use DNS_RDATACOMMON_INIT to hide branch differences

Initialization of the common members of rdata type structures varies
across branches. Standardize it by using the DNS_RDATACOMMON_INIT
macro for all types, so that new types are more likely to use it,
and hence backport more cleanly.

diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index 12f65d515a577bdb0c8a0ad3418ddb8730d7be86..21dd02fabf229b2273f7a3f46b488b5ccd2cd015 100644 (file)
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -453,9 +453,7 @@ tostruct_any_tsig(ARGS_TOSTRUCT) {
        REQUIRE(rdata->length != 0);
 
        tsig = (dns_rdata_any_tsig_t *)target;
-       tsig->common.rdclass = rdata->rdclass;
-       tsig->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&tsig->common, link);
+       DNS_RDATACOMMON_INIT(tsig, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &sr);
 

diff --git a/lib/dns/rdata/ch_3/a_1.c b/lib/dns/rdata/ch_3/a_1.c
index 791fc884f0a886d7be19f47e70f33bd8ed7ae974..bf6a48d74d27eba2d02d24b55b1c7e0299cc328a 100644 (file)
--- a/lib/dns/rdata/ch_3/a_1.c
+++ b/lib/dns/rdata/ch_3/a_1.c
@@ -225,9 +225,7 @@ tostruct_ch_a(ARGS_TOSTRUCT) {
        REQUIRE(rdata->rdclass == dns_rdataclass_ch);
        REQUIRE(rdata->length != 0);
 
-       a->common.rdclass = rdata->rdclass;
-       a->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&a->common, link);
+       DNS_RDATACOMMON_INIT(a, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
 

diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c
index 0392998abb643bf7fc6baef5d3345e772a3833fa..a4b84c23a1d50888505ad531c32bf110fbf8c401 100644 (file)
--- a/lib/dns/rdata/generic/afsdb_18.c
+++ b/lib/dns/rdata/generic/afsdb_18.c
@@ -207,9 +207,7 @@ tostruct_afsdb(ARGS_TOSTRUCT) {
        REQUIRE(afsdb != NULL);
        REQUIRE(rdata->length != 0);
 
-       afsdb->common.rdclass = rdata->rdclass;
-       afsdb->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&afsdb->common, link);
+       DNS_RDATACOMMON_INIT(afsdb, rdata->type, rdata->rdclass);
 
        dns_name_init(&afsdb->server, NULL);
 

diff --git a/lib/dns/rdata/generic/amtrelay_260.c b/lib/dns/rdata/generic/amtrelay_260.c
index b17c61405ea3f5ad269a4cdb50dc6cc3cd93443b..4d915c7947e7d56a6069507466711825119720d3 100644 (file)
--- a/lib/dns/rdata/generic/amtrelay_260.c
+++ b/lib/dns/rdata/generic/amtrelay_260.c
@@ -314,9 +314,7 @@ tostruct_amtrelay(ARGS_TOSTRUCT) {
        REQUIRE(amtrelay != NULL);
        REQUIRE(rdata->length >= 2);
 
-       amtrelay->common.rdclass = rdata->rdclass;
-       amtrelay->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&amtrelay->common, link);
+       DNS_RDATACOMMON_INIT(amtrelay, rdata->type, rdata->rdclass);
 
        dns_name_init(&amtrelay->gateway, NULL);
        amtrelay->data = NULL;

diff --git a/lib/dns/rdata/generic/avc_258.c b/lib/dns/rdata/generic/avc_258.c
index c32c008144e0123f623c2a4ebf5eeb459d5ac1a6..f19cb480e6529a2d25e0e230b913c127e1142972 100644 (file)
--- a/lib/dns/rdata/generic/avc_258.c
+++ b/lib/dns/rdata/generic/avc_258.c
@@ -75,9 +75,7 @@ tostruct_avc(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_avc);
        REQUIRE(avc != NULL);
 
-       avc->common.rdclass = rdata->rdclass;
-       avc->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&avc->common, link);
+       DNS_RDATACOMMON_INIT(avc, rdata->type, rdata->rdclass);
 
        return generic_tostruct_txt(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/caa_257.c b/lib/dns/rdata/generic/caa_257.c
index b3da2c649cbba59774ad3735c97e0b0e8e7f2e65..c3e57d25a9c4da8d71bf4a7f8dd5088228de37ca 100644 (file)
--- a/lib/dns/rdata/generic/caa_257.c
+++ b/lib/dns/rdata/generic/caa_257.c
@@ -499,9 +499,7 @@ tostruct_caa(ARGS_TOSTRUCT) {
        REQUIRE(rdata->length >= 3U);
        REQUIRE(rdata->data != NULL);
 
-       caa->common.rdclass = rdata->rdclass;
-       caa->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&caa->common, link);
+       DNS_RDATACOMMON_INIT(caa, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &sr);
 

diff --git a/lib/dns/rdata/generic/cdnskey_60.c b/lib/dns/rdata/generic/cdnskey_60.c
index 6a6e79dfd033824218a91f833231a1109f95117e..92bb1712eeba253f9214c95b0c26c6123fc7dec7 100644 (file)
--- a/lib/dns/rdata/generic/cdnskey_60.c
+++ b/lib/dns/rdata/generic/cdnskey_60.c
@@ -88,9 +88,7 @@ tostruct_cdnskey(ARGS_TOSTRUCT) {
        REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_cdnskey);
 
-       dnskey->common.rdclass = rdata->rdclass;
-       dnskey->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&dnskey->common, link);
+       DNS_RDATACOMMON_INIT(dnskey, rdata->type, rdata->rdclass);
 
        return generic_tostruct_key(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/cds_59.c b/lib/dns/rdata/generic/cds_59.c
index b4abb7adc1bb5bda4db9532f11437613d00c360a..d1ededbe4a47733256c113e30f3c2aa49b99f554 100644 (file)
--- a/lib/dns/rdata/generic/cds_59.c
+++ b/lib/dns/rdata/generic/cds_59.c
@@ -89,9 +89,7 @@ tostruct_cds(ARGS_TOSTRUCT) {
        /*
         * Checked by generic_tostruct_ds().
         */
-       cds->common.rdclass = rdata->rdclass;
-       cds->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&cds->common, link);
+       DNS_RDATACOMMON_INIT(cds, rdata->type, rdata->rdclass);
 
        return generic_tostruct_ds(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c
index 80cd7d2ebb1a592c6c9df2c0fca6821d028c22e7..354582d40485eeffb5db2d9aecc6b8f11dc06fc3 100644 (file)
--- a/lib/dns/rdata/generic/cert_37.c
+++ b/lib/dns/rdata/generic/cert_37.c
@@ -192,9 +192,7 @@ tostruct_cert(ARGS_TOSTRUCT) {
        REQUIRE(cert != NULL);
        REQUIRE(rdata->length != 0);
 
-       cert->common.rdclass = rdata->rdclass;
-       cert->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&cert->common, link);
+       DNS_RDATACOMMON_INIT(cert, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
 

diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c
index f37ecaaf9ae9d91480bf686e08f81513ade7fcef..d8841be5a7facd4e770a71a74c3358c3775d2ca9 100644 (file)
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -147,9 +147,7 @@ tostruct_cname(ARGS_TOSTRUCT) {
        REQUIRE(cname != NULL);
        REQUIRE(rdata->length != 0);
 
-       cname->common.rdclass = rdata->rdclass;
-       cname->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&cname->common, link);
+       DNS_RDATACOMMON_INIT(cname, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/csync_62.c b/lib/dns/rdata/generic/csync_62.c
index 7ac610b420e7fc8bf429ad83157e3fe5e4b76638..f77912fe60e8467aa386b06f5fcc33d30e7e13a5 100644 (file)
--- a/lib/dns/rdata/generic/csync_62.c
+++ b/lib/dns/rdata/generic/csync_62.c
@@ -169,9 +169,7 @@ tostruct_csync(ARGS_TOSTRUCT) {
        REQUIRE(csync != NULL);
        REQUIRE(rdata->length != 0);
 
-       csync->common.rdclass = rdata->rdclass;
-       csync->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&csync->common, link);
+       DNS_RDATACOMMON_INIT(csync, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
 

diff --git a/lib/dns/rdata/generic/dlv_32769.c b/lib/dns/rdata/generic/dlv_32769.c
index b932e8af65fe8e7d3188064a3e40e7eb035eeb29..8a0e7727e93ba5e761ba2f8ce29e7929ea5384e2 100644 (file)
--- a/lib/dns/rdata/generic/dlv_32769.c
+++ b/lib/dns/rdata/generic/dlv_32769.c
@@ -85,9 +85,7 @@ tostruct_dlv(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_dlv);
        REQUIRE(dlv != NULL);
 
-       dlv->common.rdclass = rdata->rdclass;
-       dlv->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&dlv->common, link);
+       DNS_RDATACOMMON_INIT(dlv, rdata->type, rdata->rdclass);
 
        return generic_tostruct_ds(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c
index f00ec45bf0b56f2504d1050dbf33ea36d4936b3d..ca199f5f31bd7bf48158edadd99e927656aec9b5 100644 (file)
--- a/lib/dns/rdata/generic/dname_39.c
+++ b/lib/dns/rdata/generic/dname_39.c
@@ -147,9 +147,7 @@ tostruct_dname(ARGS_TOSTRUCT) {
        REQUIRE(dname != NULL);
        REQUIRE(rdata->length != 0);
 
-       dname->common.rdclass = rdata->rdclass;
-       dname->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&dname->common, link);
+       DNS_RDATACOMMON_INIT(dname, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/dnskey_48.c b/lib/dns/rdata/generic/dnskey_48.c
index aff39df4a6bb607cb76377a7f6e527fd2fef33df..aeb98fc507555fc57bbd38967f81fa00951c0d1c 100644 (file)
--- a/lib/dns/rdata/generic/dnskey_48.c
+++ b/lib/dns/rdata/generic/dnskey_48.c
@@ -89,9 +89,7 @@ tostruct_dnskey(ARGS_TOSTRUCT) {
        REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_dnskey);
 
-       dnskey->common.rdclass = rdata->rdclass;
-       dnskey->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&dnskey->common, link);
+       DNS_RDATACOMMON_INIT(dnskey, rdata->type, rdata->rdclass);
 
        return generic_tostruct_key(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/doa_259.c b/lib/dns/rdata/generic/doa_259.c
index 03c92769f20b04d58976596ee4e67d859565bc6d..da12d77dca9b5a46261faa7d988ca126b7102002 100644 (file)
--- a/lib/dns/rdata/generic/doa_259.c
+++ b/lib/dns/rdata/generic/doa_259.c
@@ -215,9 +215,7 @@ tostruct_doa(ARGS_TOSTRUCT) {
        REQUIRE(doa != NULL);
        REQUIRE(rdata->length != 0);
 
-       doa->common.rdclass = rdata->rdclass;
-       doa->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&doa->common, link);
+       DNS_RDATACOMMON_INIT(doa, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
 

diff --git a/lib/dns/rdata/generic/ds_43.c b/lib/dns/rdata/generic/ds_43.c
index 665bd7278d3c92f9699fdfea8a14fd5639d36648..30aca3ad2bf2c49878857d38abf02c160b3a8260 100644 (file)
--- a/lib/dns/rdata/generic/ds_43.c
+++ b/lib/dns/rdata/generic/ds_43.c
@@ -308,9 +308,7 @@ tostruct_ds(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_ds);
        REQUIRE(ds != NULL);
 
-       ds->common.rdclass = rdata->rdclass;
-       ds->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&ds->common, link);
+       DNS_RDATACOMMON_INIT(ds, rdata->type, rdata->rdclass);
 
        return generic_tostruct_ds(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/dsync_66.c b/lib/dns/rdata/generic/dsync_66.c
index 52867df1dc6887e7709d418ffd3b0fdf1f3cbf0f..09303befb6fd69b76124b2ecc645f569f1193969 100644 (file)
--- a/lib/dns/rdata/generic/dsync_66.c
+++ b/lib/dns/rdata/generic/dsync_66.c
@@ -253,9 +253,7 @@ tostruct_dsync(ARGS_TOSTRUCT) {
        REQUIRE(dsync != NULL);
        REQUIRE(rdata->length != 0);
 
-       dsync->common.rdclass = rdata->rdclass;
-       dsync->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&dsync->common, link);
+       DNS_RDATACOMMON_INIT(dsync, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/eui48_108.c b/lib/dns/rdata/generic/eui48_108.c
index 0550698414fd17155dd94bd32969e990ce139efd..9c1f8c1c6de003608568709fecfbe0f037e2d423 100644 (file)
--- a/lib/dns/rdata/generic/eui48_108.c
+++ b/lib/dns/rdata/generic/eui48_108.c
@@ -137,9 +137,7 @@ tostruct_eui48(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       eui48->common.rdclass = rdata->rdclass;
-       eui48->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&eui48->common, link);
+       DNS_RDATACOMMON_INIT(eui48, rdata->type, rdata->rdclass);
 
        memmove(eui48->eui48, rdata->data, rdata->length);
        return ISC_R_SUCCESS;

diff --git a/lib/dns/rdata/generic/eui64_109.c b/lib/dns/rdata/generic/eui64_109.c
index 12b6ebbbf9a48d5a6b2b9882c96f3965a13aecb6..6ad7422288592e283d268e7c46178013c10e124a 100644 (file)
--- a/lib/dns/rdata/generic/eui64_109.c
+++ b/lib/dns/rdata/generic/eui64_109.c
@@ -140,9 +140,7 @@ tostruct_eui64(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       eui64->common.rdclass = rdata->rdclass;
-       eui64->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&eui64->common, link);
+       DNS_RDATACOMMON_INIT(eui64, rdata->type, rdata->rdclass);
 
        memmove(eui64->eui64, rdata->data, rdata->length);
        return ISC_R_SUCCESS;

diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c
index 7f08a640e3608cc74b8e147db42ef4e8a3c3eb56..09f15b93204832fb1f031b2d47012d2187e9179a 100644 (file)
--- a/lib/dns/rdata/generic/gpos_27.c
+++ b/lib/dns/rdata/generic/gpos_27.c
@@ -133,9 +133,7 @@ tostruct_gpos(ARGS_TOSTRUCT) {
        REQUIRE(gpos != NULL);
        REQUIRE(rdata->length != 0);
 
-       gpos->common.rdclass = rdata->rdclass;
-       gpos->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&gpos->common, link);
+       DNS_RDATACOMMON_INIT(gpos, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
        gpos->long_len = uint8_fromregion(&region);

diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c
index b074f6ff38cabf2706555a2401ed11645e5726d9..f6ebb93885b06a40b088de56e2e5ed14b563d174 100644 (file)
--- a/lib/dns/rdata/generic/hinfo_13.c
+++ b/lib/dns/rdata/generic/hinfo_13.c
@@ -117,9 +117,7 @@ tostruct_hinfo(ARGS_TOSTRUCT) {
        REQUIRE(hinfo != NULL);
        REQUIRE(rdata->length != 0);
 
-       hinfo->common.rdclass = rdata->rdclass;
-       hinfo->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&hinfo->common, link);
+       DNS_RDATACOMMON_INIT(hinfo, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
        hinfo->cpu_len = uint8_fromregion(&region);

diff --git a/lib/dns/rdata/generic/hip_55.c b/lib/dns/rdata/generic/hip_55.c
index 9fee1dc76adea06e9ce71d67f2241edff1352427..7843957597cdd37e37a0f1368bfb0faca58ea47b 100644 (file)
--- a/lib/dns/rdata/generic/hip_55.c
+++ b/lib/dns/rdata/generic/hip_55.c
@@ -306,9 +306,7 @@ tostruct_hip(ARGS_TOSTRUCT) {
        REQUIRE(hip != NULL);
        REQUIRE(rdata->length != 0);
 
-       hip->common.rdclass = rdata->rdclass;
-       hip->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&hip->common, link);
+       DNS_RDATACOMMON_INIT(hip, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
 

diff --git a/lib/dns/rdata/generic/ipseckey_45.c b/lib/dns/rdata/generic/ipseckey_45.c
index e1aa50329e1f109d04f3883ce01d109e44c294c9..bd6442b5586104a302338fbe9a22f9671c03d5d4 100644 (file)
--- a/lib/dns/rdata/generic/ipseckey_45.c
+++ b/lib/dns/rdata/generic/ipseckey_45.c
@@ -357,9 +357,7 @@ tostruct_ipseckey(ARGS_TOSTRUCT) {
                return ISC_R_NOTIMPLEMENTED;
        }
 
-       ipseckey->common.rdclass = rdata->rdclass;
-       ipseckey->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&ipseckey->common, link);
+       DNS_RDATACOMMON_INIT(ipseckey, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c
index 4da1fedbc1939d04b348663f1df7d04d9025a931..11640fc6fe7f5855e49cf09dcd92fe02ff7a2ec9 100644 (file)
--- a/lib/dns/rdata/generic/isdn_20.c
+++ b/lib/dns/rdata/generic/isdn_20.c
@@ -138,9 +138,7 @@ tostruct_isdn(ARGS_TOSTRUCT) {
        REQUIRE(isdn != NULL);
        REQUIRE(rdata->length != 0);
 
-       isdn->common.rdclass = rdata->rdclass;
-       isdn->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&isdn->common, link);
+       DNS_RDATACOMMON_INIT(isdn, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &r);
 

diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index 31ea0b7c63312a419a1d27e91cb4f1cf9ac385fe..c83ce9f796ea5ad53fa5ff6728791387570563d7 100644 (file)
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -395,9 +395,7 @@ tostruct_key(ARGS_TOSTRUCT) {
        REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_key);
 
-       key->common.rdclass = rdata->rdclass;
-       key->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&key->common, link);
+       DNS_RDATACOMMON_INIT(key, rdata->type, rdata->rdclass);
 
        return generic_tostruct_key(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/keydata_65533.c b/lib/dns/rdata/generic/keydata_65533.c
index e359601544aef1eaf52eef108765d714d62198e8..ec1404557c56aed2ae21cbcc34fa514598b19e1e 100644 (file)
--- a/lib/dns/rdata/generic/keydata_65533.c
+++ b/lib/dns/rdata/generic/keydata_65533.c
@@ -333,9 +333,7 @@ tostruct_keydata(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_keydata);
        REQUIRE(keydata != NULL);
 
-       keydata->common.rdclass = rdata->rdclass;
-       keydata->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&keydata->common, link);
+       DNS_RDATACOMMON_INIT(keydata, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &sr);
 

diff --git a/lib/dns/rdata/generic/l32_105.c b/lib/dns/rdata/generic/l32_105.c
index ed618109304ea65b66ab0d12e3fd923944c9fdf5..05aaa2910aec29bb23f8d1bcbab6fbe56810d16b 100644 (file)
--- a/lib/dns/rdata/generic/l32_105.c
+++ b/lib/dns/rdata/generic/l32_105.c
@@ -153,9 +153,7 @@ tostruct_l32(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       l32->common.rdclass = rdata->rdclass;
-       l32->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&l32->common, link);
+       DNS_RDATACOMMON_INIT(l32, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
        l32->pref = uint16_fromregion(&region);

diff --git a/lib/dns/rdata/generic/l64_106.c b/lib/dns/rdata/generic/l64_106.c
index 62eda4f2bc3288d6e1ce94325102514627e8306e..6f43eb884a8cc77199e27d6898594b6f8bc50bc3 100644 (file)
--- a/lib/dns/rdata/generic/l64_106.c
+++ b/lib/dns/rdata/generic/l64_106.c
@@ -148,9 +148,7 @@ tostruct_l64(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       l64->common.rdclass = rdata->rdclass;
-       l64->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&l64->common, link);
+       DNS_RDATACOMMON_INIT(l64, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
        l64->pref = uint16_fromregion(&region);

diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c
index f71d3ec4abdd930c3258c5b22052152fd562072e..3f9a4ee2ed1f9811fd736772e7db8fa1c1547009 100644 (file)
--- a/lib/dns/rdata/generic/loc_29.c
+++ b/lib/dns/rdata/generic/loc_29.c
@@ -753,9 +753,7 @@ tostruct_loc(ARGS_TOSTRUCT) {
                return ISC_R_NOTIMPLEMENTED;
        }
 
-       loc->common.rdclass = rdata->rdclass;
-       loc->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&loc->common, link);
+       DNS_RDATACOMMON_INIT(loc, rdata->type, rdata->rdclass);
 
        loc->v.v0.version = version;
        isc_region_consume(&r, 1);

diff --git a/lib/dns/rdata/generic/lp_107.c b/lib/dns/rdata/generic/lp_107.c
index c5867cb8aa6fb92c7a30aefa7704920689661807..5faf8f5424a4f3b5a28d81737aa49f08e931d631 100644 (file)
--- a/lib/dns/rdata/generic/lp_107.c
+++ b/lib/dns/rdata/generic/lp_107.c
@@ -156,9 +156,7 @@ tostruct_lp(ARGS_TOSTRUCT) {
        REQUIRE(lp != NULL);
        REQUIRE(rdata->length != 0);
 
-       lp->common.rdclass = rdata->rdclass;
-       lp->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&lp->common, link);
+       DNS_RDATACOMMON_INIT(lp, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index 80a1b651d57b06f2e39f6cdd8455f007c001b2d9..d29140846c5c5791ee31e77c994daa49c0ace1d7 100644 (file)
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -146,9 +146,7 @@ tostruct_mb(ARGS_TOSTRUCT) {
        REQUIRE(mb != NULL);
        REQUIRE(rdata->length != 0);
 
-       mb->common.rdclass = rdata->rdclass;
-       mb->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&mb->common, link);
+       DNS_RDATACOMMON_INIT(mb, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index 34dfa98fe8b2d215bcc822d2f930d41f8441a8a7..6d3ecf124dfbda68d1f4bbffbe89a7e4ad2a11a8 100644 (file)
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -146,9 +146,7 @@ tostruct_md(ARGS_TOSTRUCT) {
        REQUIRE(md != NULL);
        REQUIRE(rdata->length != 0);
 
-       md->common.rdclass = rdata->rdclass;
-       md->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&md->common, link);
+       DNS_RDATACOMMON_INIT(md, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &r);

diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index 2fe0030b304bcd88d4d5e194511cab9f67afb6a8..8015df323ef32fac2bd77dec152ef96ff45b6a20 100644 (file)
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -146,9 +146,7 @@ tostruct_mf(ARGS_TOSTRUCT) {
        REQUIRE(mf != NULL);
        REQUIRE(rdata->length != 0);
 
-       mf->common.rdclass = rdata->rdclass;
-       mf->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&mf->common, link);
+       DNS_RDATACOMMON_INIT(mf, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &r);

diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c
index 3119ca279606564a4337fb1c9a9a637342854f2b..9f2a40512daa187fdc9d7618ac8b8ea7b616424d 100644 (file)
--- a/lib/dns/rdata/generic/mg_8.c
+++ b/lib/dns/rdata/generic/mg_8.c
@@ -146,9 +146,7 @@ tostruct_mg(ARGS_TOSTRUCT) {
        REQUIRE(mg != NULL);
        REQUIRE(rdata->length != 0);
 
-       mg->common.rdclass = rdata->rdclass;
-       mg->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&mg->common, link);
+       DNS_RDATACOMMON_INIT(mg, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c
index a143c6e9f16c52d60db91b5d787490ec08ea97a3..09011cbf546ee4ac2c04ab02783cb8916caf3438 100644 (file)
--- a/lib/dns/rdata/generic/minfo_14.c
+++ b/lib/dns/rdata/generic/minfo_14.c
@@ -206,9 +206,7 @@ tostruct_minfo(ARGS_TOSTRUCT) {
        REQUIRE(minfo != NULL);
        REQUIRE(rdata->length != 0);
 
-       minfo->common.rdclass = rdata->rdclass;
-       minfo->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&minfo->common, link);
+       DNS_RDATACOMMON_INIT(minfo, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c
index 620d420ed91939a8ccd148f3fc2b234e4abf27d2..ee8c7162eb41ccef83ed8b036ab1b9d94e71f991 100644 (file)
--- a/lib/dns/rdata/generic/mr_9.c
+++ b/lib/dns/rdata/generic/mr_9.c
@@ -146,9 +146,7 @@ tostruct_mr(ARGS_TOSTRUCT) {
        REQUIRE(mr != NULL);
        REQUIRE(rdata->length != 0);
 
-       mr->common.rdclass = rdata->rdclass;
-       mr->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&mr->common, link);
+       DNS_RDATACOMMON_INIT(mr, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index 8efde02948bdab0dfa8b1dafc7f28ddea7fd2a65..12c44c58ab06a366340607cc7880d8bba5aba8e3 100644 (file)
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -230,9 +230,7 @@ tostruct_mx(ARGS_TOSTRUCT) {
        REQUIRE(mx != NULL);
        REQUIRE(rdata->length != 0);
 
-       mx->common.rdclass = rdata->rdclass;
-       mx->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&mx->common, link);
+       DNS_RDATACOMMON_INIT(mx, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/naptr_35.c b/lib/dns/rdata/generic/naptr_35.c
index a334fc4ca28780fed89c8d258d7f9ed8a8417ab3..6035711457f7401ee2a899c58d5f3c8eeb1b8eb0 100644 (file)
--- a/lib/dns/rdata/generic/naptr_35.c
+++ b/lib/dns/rdata/generic/naptr_35.c
@@ -501,9 +501,7 @@ tostruct_naptr(ARGS_TOSTRUCT) {
        REQUIRE(naptr != NULL);
        REQUIRE(rdata->length != 0);
 
-       naptr->common.rdclass = rdata->rdclass;
-       naptr->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&naptr->common, link);
+       DNS_RDATACOMMON_INIT(naptr, rdata->type, rdata->rdclass);
 
        naptr->flags = NULL;
        naptr->service = NULL;

diff --git a/lib/dns/rdata/generic/nid_104.c b/lib/dns/rdata/generic/nid_104.c
index 832326bec33f8e4f16bce772673125dfe9a8587f..0782edf44782a43c94d4a654247224135d9508e7 100644 (file)
--- a/lib/dns/rdata/generic/nid_104.c
+++ b/lib/dns/rdata/generic/nid_104.c
@@ -148,9 +148,7 @@ tostruct_nid(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       nid->common.rdclass = rdata->rdclass;
-       nid->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&nid->common, link);
+       DNS_RDATACOMMON_INIT(nid, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
        nid->pref = uint16_fromregion(&region);

diff --git a/lib/dns/rdata/generic/ninfo_56.c b/lib/dns/rdata/generic/ninfo_56.c
index 8bed8637d3f2e3c5984d1c8fd62439f92778d80e..100acdcf4609281dfd8986ec97b5423aaaeda8b6 100644 (file)
--- a/lib/dns/rdata/generic/ninfo_56.c
+++ b/lib/dns/rdata/generic/ninfo_56.c
@@ -75,9 +75,7 @@ tostruct_ninfo(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_ninfo);
        REQUIRE(ninfo != NULL);
 
-       ninfo->common.rdclass = rdata->rdclass;
-       ninfo->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&ninfo->common, link);
+       DNS_RDATACOMMON_INIT(ninfo, rdata->type, rdata->rdclass);
 
        return generic_tostruct_txt(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c
index c3d2d22076659e14b82b303e9e85826263e43b0d..54685f88f3748a0ed4b31ed264b00ecafde29cef 100644 (file)
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -157,9 +157,7 @@ tostruct_ns(ARGS_TOSTRUCT) {
        REQUIRE(ns != NULL);
        REQUIRE(rdata->length != 0);
 
-       ns->common.rdclass = rdata->rdclass;
-       ns->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&ns->common, link);
+       DNS_RDATACOMMON_INIT(ns, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/nsec3_50.c b/lib/dns/rdata/generic/nsec3_50.c
index d7e30503d0b358e45d4a54a390366ea76b6672b8..f45fe4dc33336913efcd917782e9df04f34c6df0 100644 (file)
--- a/lib/dns/rdata/generic/nsec3_50.c
+++ b/lib/dns/rdata/generic/nsec3_50.c
@@ -293,9 +293,7 @@ tostruct_nsec3(ARGS_TOSTRUCT) {
        REQUIRE(nsec3 != NULL);
        REQUIRE(rdata->length != 0);
 
-       nsec3->common.rdclass = rdata->rdclass;
-       nsec3->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&nsec3->common, link);
+       DNS_RDATACOMMON_INIT(nsec3, rdata->type, rdata->rdclass);
 
        region.base = rdata->data;
        region.length = rdata->length;

diff --git a/lib/dns/rdata/generic/nsec3param_51.c b/lib/dns/rdata/generic/nsec3param_51.c
index 7136811fa8c6b8feb3a64f0a52ed20addcd3ee11..3b66a0f9c069243b2aae2a46fe661060831b3950 100644 (file)
--- a/lib/dns/rdata/generic/nsec3param_51.c
+++ b/lib/dns/rdata/generic/nsec3param_51.c
@@ -229,9 +229,7 @@ tostruct_nsec3param(ARGS_TOSTRUCT) {
        REQUIRE(nsec3param != NULL);
        REQUIRE(rdata->length != 0);
 
-       nsec3param->common.rdclass = rdata->rdclass;
-       nsec3param->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&nsec3param->common, link);
+       DNS_RDATACOMMON_INIT(nsec3param, rdata->type, rdata->rdclass);
 
        region.base = rdata->data;
        region.length = rdata->length;

diff --git a/lib/dns/rdata/generic/nsec_47.c b/lib/dns/rdata/generic/nsec_47.c
index 30efa3de4f9e5963cc1cda0fd86f01da49c1dfee..c0ab29df19afcd7e0b660809480899a23bfbed24 100644 (file)
--- a/lib/dns/rdata/generic/nsec_47.c
+++ b/lib/dns/rdata/generic/nsec_47.c
@@ -165,9 +165,7 @@ tostruct_nsec(ARGS_TOSTRUCT) {
        REQUIRE(nsec != NULL);
        REQUIRE(rdata->length != 0);
 
-       nsec->common.rdclass = rdata->rdclass;
-       nsec->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&nsec->common, link);
+       DNS_RDATACOMMON_INIT(nsec, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c
index 310e8c2871cf909de658b9b34b9e9306f87a5b94..77d9bf9b5b80c226576c0fe4595a42c65c697106 100644 (file)
--- a/lib/dns/rdata/generic/null_10.c
+++ b/lib/dns/rdata/generic/null_10.c
@@ -101,9 +101,7 @@ tostruct_null(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_null);
        REQUIRE(null != NULL);
 
-       null->common.rdclass = rdata->rdclass;
-       null->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&null->common, link);
+       DNS_RDATACOMMON_INIT(null, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &r);
        null->length = r.length;

diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index 788243274ad3f65083eaf4c35dabb6647bb4513a..61f3af79472e0fadfbd963b0252bbf6d6436b518 100644 (file)
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -244,9 +244,7 @@ tostruct_nxt(ARGS_TOSTRUCT) {
        REQUIRE(nxt != NULL);
        REQUIRE(rdata->length != 0);
 
-       nxt->common.rdclass = rdata->rdclass;
-       nxt->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&nxt->common, link);
+       DNS_RDATACOMMON_INIT(nxt, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/openpgpkey_61.c b/lib/dns/rdata/generic/openpgpkey_61.c
index 208537b97ad718ba71711feb8fe2ef30305aa5f1..89554094606e86125b72c7633ea9cd9213d78049 100644 (file)
--- a/lib/dns/rdata/generic/openpgpkey_61.c
+++ b/lib/dns/rdata/generic/openpgpkey_61.c
@@ -145,9 +145,7 @@ tostruct_openpgpkey(ARGS_TOSTRUCT) {
        REQUIRE(sig != NULL);
        REQUIRE(rdata->length != 0);
 
-       sig->common.rdclass = rdata->rdclass;
-       sig->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&sig->common, link);
+       DNS_RDATACOMMON_INIT(sig, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &sr);
 

diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index 51ff8d4de5ac53738b3cb76a4a2718a6463192aa..f3ac152061d32633e1a8d5c68134fda1ebe7c7f5 100644 (file)
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -323,9 +323,7 @@ tostruct_opt(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_opt);
        REQUIRE(opt != NULL);
 
-       opt->common.rdclass = rdata->rdclass;
-       opt->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&opt->common, link);
+       DNS_RDATACOMMON_INIT(opt, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &r);
        opt->length = r.length;

diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c
index 9544f906e1e630de4469a9fdb0d275b8e6359862..26d36b79e956bd839a692fd70b5db5e243a17b10 100644 (file)
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -159,9 +159,7 @@ tostruct_ptr(ARGS_TOSTRUCT) {
        REQUIRE(ptr != NULL);
        REQUIRE(rdata->length != 0);
 
-       ptr->common.rdclass = rdata->rdclass;
-       ptr->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&ptr->common, link);
+       DNS_RDATACOMMON_INIT(ptr, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/resinfo_261.c b/lib/dns/rdata/generic/resinfo_261.c
index 7c18c402119e21c2d100a47e3a47370a8fe7d2e1..a34895c7a90b346850c45eac4c4d635b2e1efb45 100644 (file)
--- a/lib/dns/rdata/generic/resinfo_261.c
+++ b/lib/dns/rdata/generic/resinfo_261.c
@@ -76,9 +76,7 @@ tostruct_resinfo(ARGS_TOSTRUCT) {
        REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_resinfo);
 
-       resinfo->common.rdclass = rdata->rdclass;
-       resinfo->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&resinfo->common, link);
+       DNS_RDATACOMMON_INIT(resinfo, rdata->type, rdata->rdclass);
 
        return generic_tostruct_txt(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/rkey_57.c b/lib/dns/rdata/generic/rkey_57.c
index 4ed504fd2a3a135d36dc04ec360cce8434d12f6f..e2882f68eacbcde65673b833fc967a81065fe669 100644 (file)
--- a/lib/dns/rdata/generic/rkey_57.c
+++ b/lib/dns/rdata/generic/rkey_57.c
@@ -85,9 +85,7 @@ tostruct_rkey(ARGS_TOSTRUCT) {
        REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_rkey);
 
-       rkey->common.rdclass = rdata->rdclass;
-       rkey->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&rkey->common, link);
+       DNS_RDATACOMMON_INIT(rkey, rdata->type, rdata->rdclass);
 
        return generic_tostruct_key(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c
index 86de8633fc63a4bf22c0e9c7acb931788e08744f..eb3c9561902997ba4c802c083dead470c4faaca2 100644 (file)
--- a/lib/dns/rdata/generic/rp_17.c
+++ b/lib/dns/rdata/generic/rp_17.c
@@ -205,9 +205,7 @@ tostruct_rp(ARGS_TOSTRUCT) {
        REQUIRE(rp != NULL);
        REQUIRE(rdata->length != 0);
 
-       rp->common.rdclass = rdata->rdclass;
-       rp->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&rp->common, link);
+       DNS_RDATACOMMON_INIT(rp, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c
index 2fb197b300deee32217602acb49e0defc838e4f5..10bc039e932f1e2c2869929e1d638aab16c50b7a 100644 (file)
--- a/lib/dns/rdata/generic/rrsig_46.c
+++ b/lib/dns/rdata/generic/rrsig_46.c
@@ -471,9 +471,7 @@ tostruct_rrsig(ARGS_TOSTRUCT) {
        REQUIRE(sig != NULL);
        REQUIRE(rdata->length != 0);
 
-       sig->common.rdclass = rdata->rdclass;
-       sig->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&sig->common, link);
+       DNS_RDATACOMMON_INIT(sig, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &sr);
 

diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c
index 9413e27019cbbd291120682c714724ed1dc38eb9..682cd4a57e439f4dcc5023f5e8410ad31b311e6c 100644 (file)
--- a/lib/dns/rdata/generic/rt_21.c
+++ b/lib/dns/rdata/generic/rt_21.c
@@ -203,9 +203,7 @@ tostruct_rt(ARGS_TOSTRUCT) {
        REQUIRE(rt != NULL);
        REQUIRE(rdata->length != 0);
 
-       rt->common.rdclass = rdata->rdclass;
-       rt->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&rt->common, link);
+       DNS_RDATACOMMON_INIT(rt, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index 31b293c589a144e86e8c8253d1e0f40524d0e6fe..a134ade8cdae932f06ae0d24db36edc8e9f6e3b6 100644 (file)
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -434,9 +434,7 @@ tostruct_sig(ARGS_TOSTRUCT) {
        REQUIRE(sig != NULL);
        REQUIRE(rdata->length != 0);
 
-       sig->common.rdclass = rdata->rdclass;
-       sig->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&sig->common, link);
+       DNS_RDATACOMMON_INIT(sig, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &sr);
 

diff --git a/lib/dns/rdata/generic/sink_40.c b/lib/dns/rdata/generic/sink_40.c
index f6e47ae2c85aae55f6df2ea3e0f9bbd39217d165..78076884cec5cb0515c4c416e20261aa40321123 100644 (file)
--- a/lib/dns/rdata/generic/sink_40.c
+++ b/lib/dns/rdata/generic/sink_40.c
@@ -184,9 +184,7 @@ tostruct_sink(ARGS_TOSTRUCT) {
        REQUIRE(sink != NULL);
        REQUIRE(rdata->length >= 3);
 
-       sink->common.rdclass = rdata->rdclass;
-       sink->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&sink->common, link);
+       DNS_RDATACOMMON_INIT(sink, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &sr);
 

diff --git a/lib/dns/rdata/generic/smimea_53.c b/lib/dns/rdata/generic/smimea_53.c
index ea947770dbcd76431c75e34ad495c4a23aa998cd..2ddcab81f8f48ffafb4095b3d2a1416fe01d751c 100644 (file)
--- a/lib/dns/rdata/generic/smimea_53.c
+++ b/lib/dns/rdata/generic/smimea_53.c
@@ -82,9 +82,7 @@ tostruct_smimea(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_smimea);
        REQUIRE(smimea != NULL);
 
-       smimea->common.rdclass = rdata->rdclass;
-       smimea->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&smimea->common, link);
+       DNS_RDATACOMMON_INIT(smimea, rdata->type, rdata->rdclass);
 
        return generic_tostruct_tlsa(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index 88ba3caf5dae938889eef8539eed337c8f827f3f..f02bd635019f49df612c912a00ba3b714787877c 100644 (file)
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -309,9 +309,7 @@ tostruct_soa(ARGS_TOSTRUCT) {
        REQUIRE(soa != NULL);
        REQUIRE(rdata->length != 0);
 
-       soa->common.rdclass = rdata->rdclass;
-       soa->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&soa->common, link);
+       DNS_RDATACOMMON_INIT(soa, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
 

diff --git a/lib/dns/rdata/generic/spf_99.c b/lib/dns/rdata/generic/spf_99.c
index 9347a74624be80d0f1a3acac4b156635aafc950d..39918605512d0541a979be2b7a6b500fbb10305e 100644 (file)
--- a/lib/dns/rdata/generic/spf_99.c
+++ b/lib/dns/rdata/generic/spf_99.c
@@ -76,9 +76,7 @@ tostruct_spf(ARGS_TOSTRUCT) {
        REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_spf);
 
-       spf->common.rdclass = rdata->rdclass;
-       spf->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&spf->common, link);
+       DNS_RDATACOMMON_INIT(spf, rdata->type, rdata->rdclass);
 
        return generic_tostruct_txt(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/sshfp_44.c b/lib/dns/rdata/generic/sshfp_44.c
index 9104fa5945ad29f7f9a2220d8ae24c0e11b06e3c..5a67ad36dd38b133f0d207f69e8faef0f81053fd 100644 (file)
--- a/lib/dns/rdata/generic/sshfp_44.c
+++ b/lib/dns/rdata/generic/sshfp_44.c
@@ -205,9 +205,7 @@ tostruct_sshfp(ARGS_TOSTRUCT) {
        REQUIRE(sshfp != NULL);
        REQUIRE(rdata->length != 0);
 
-       sshfp->common.rdclass = rdata->rdclass;
-       sshfp->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&sshfp->common, link);
+       DNS_RDATACOMMON_INIT(sshfp, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
 

diff --git a/lib/dns/rdata/generic/ta_32768.c b/lib/dns/rdata/generic/ta_32768.c
index 186190263ae6e07fef5013970faeff40c9e070fb..151f6b500cee249288af58c7a0fa8ffcf150ccf9 100644 (file)
--- a/lib/dns/rdata/generic/ta_32768.c
+++ b/lib/dns/rdata/generic/ta_32768.c
@@ -85,9 +85,7 @@ tostruct_ta(ARGS_TOSTRUCT) {
        /*
         * Checked by generic_tostruct_ds().
         */
-       ds->common.rdclass = rdata->rdclass;
-       ds->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&ds->common, link);
+       DNS_RDATACOMMON_INIT(ds, rdata->type, rdata->rdclass);
 
        return generic_tostruct_ds(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/talink_58.c b/lib/dns/rdata/generic/talink_58.c
index d1dbf1220b0532c9a8ea20932521b1079f647824..dc8e5c03c43fd43f13c5a54f944af52218f26134 100644 (file)
--- a/lib/dns/rdata/generic/talink_58.c
+++ b/lib/dns/rdata/generic/talink_58.c
@@ -169,9 +169,7 @@ tostruct_talink(ARGS_TOSTRUCT) {
        REQUIRE(talink != NULL);
        REQUIRE(rdata->length != 0);
 
-       talink->common.rdclass = rdata->rdclass;
-       talink->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&talink->common, link);
+       DNS_RDATACOMMON_INIT(talink, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
 

diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index a40402335847b4e20f5cf4980c1ec8f7970927f3..45e83daebcf07f03aa3392e356874900e484cc2b 100644 (file)
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -425,9 +425,7 @@ tostruct_tkey(ARGS_TOSTRUCT) {
        REQUIRE(tkey != NULL);
        REQUIRE(rdata->length != 0);
 
-       tkey->common.rdclass = rdata->rdclass;
-       tkey->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&tkey->common, link);
+       DNS_RDATACOMMON_INIT(tkey, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &sr);
 

diff --git a/lib/dns/rdata/generic/tlsa_52.c b/lib/dns/rdata/generic/tlsa_52.c
index aefab8a114c15014d77f5ae1e5d58d3fc00eb19b..a359f31c55d29198b9c8acf92faa4d747e806c3f 100644 (file)
--- a/lib/dns/rdata/generic/tlsa_52.c
+++ b/lib/dns/rdata/generic/tlsa_52.c
@@ -269,9 +269,7 @@ tostruct_tlsa(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_tlsa);
        REQUIRE(tlsa != NULL);
 
-       tlsa->common.rdclass = rdata->rdclass;
-       tlsa->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&tlsa->common, link);
+       DNS_RDATACOMMON_INIT(tlsa, rdata->type, rdata->rdclass);
 
        return generic_tostruct_tlsa(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c
index 093ed26d5b1326cd64a1604738069f1aef1a53f4..578a07151bad4c0a9ed34a95d39848856b101636 100644 (file)
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -212,9 +212,7 @@ tostruct_txt(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_txt);
        REQUIRE(txt != NULL);
 
-       txt->common.rdclass = rdata->rdclass;
-       txt->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&txt->common, link);
+       DNS_RDATACOMMON_INIT(txt, rdata->type, rdata->rdclass);
 
        return generic_tostruct_txt(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/uri_256.c b/lib/dns/rdata/generic/uri_256.c
index 2f423b341faae8e4dbfc7c51f4720468b7f45cf8..7a7dafa8ecdd058c3a09179340181e06a0c66130 100644 (file)
--- a/lib/dns/rdata/generic/uri_256.c
+++ b/lib/dns/rdata/generic/uri_256.c
@@ -211,9 +211,7 @@ tostruct_uri(ARGS_TOSTRUCT) {
        REQUIRE(uri != NULL);
        REQUIRE(rdata->length != 0);
 
-       uri->common.rdclass = rdata->rdclass;
-       uri->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&uri->common, link);
+       DNS_RDATACOMMON_INIT(uri, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &sr);
 

diff --git a/lib/dns/rdata/generic/wallet_262.c b/lib/dns/rdata/generic/wallet_262.c
index 106003cc138d8980b69f1eebf3000c8a20630fd3..0cab8ee3b1721062b66b59b532483e011392777f 100644 (file)
--- a/lib/dns/rdata/generic/wallet_262.c
+++ b/lib/dns/rdata/generic/wallet_262.c
@@ -75,9 +75,7 @@ tostruct_wallet(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_wallet);
        REQUIRE(wallet != NULL);
 
-       wallet->common.rdclass = rdata->rdclass;
-       wallet->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&wallet->common, link);
+       DNS_RDATACOMMON_INIT(wallet, rdata->type, rdata->rdclass);
 
        return generic_tostruct_txt(CALL_TOSTRUCT);
 }

diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c
index 11e618c569fc89405f453845caf28e20c0d7de6f..7718bb26f9e19b512c9759e5384094025594b5bd 100644 (file)
--- a/lib/dns/rdata/generic/x25_19.c
+++ b/lib/dns/rdata/generic/x25_19.c
@@ -146,9 +146,7 @@ tostruct_x25(ARGS_TOSTRUCT) {
        REQUIRE(x25 != NULL);
        REQUIRE(rdata->length != 0);
 
-       x25->common.rdclass = rdata->rdclass;
-       x25->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&x25->common, link);
+       DNS_RDATACOMMON_INIT(x25, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &r);
        x25->x25_len = uint8_fromregion(&r);

diff --git a/lib/dns/rdata/generic/zonemd_63.c b/lib/dns/rdata/generic/zonemd_63.c
index 007c0ac6f35e4f3ee48b7c3962b9bac26ac91f27..e0b53ba7386173ab404b0d79ce27b1725e687ab5 100644 (file)
--- a/lib/dns/rdata/generic/zonemd_63.c
+++ b/lib/dns/rdata/generic/zonemd_63.c
@@ -257,9 +257,7 @@ tostruct_zonemd(ARGS_TOSTRUCT) {
        REQUIRE(zonemd != NULL);
        REQUIRE(rdata->length != 0);
 
-       zonemd->common.rdclass = rdata->rdclass;
-       zonemd->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&zonemd->common, link);
+       DNS_RDATACOMMON_INIT(zonemd, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
 

diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c
index d142c7337b408708398706fa00254cfe5516ba90..52b826b2bda146809538905a50d45010989f3c25 100644 (file)
--- a/lib/dns/rdata/hs_4/a_1.c
+++ b/lib/dns/rdata/hs_4/a_1.c
@@ -159,9 +159,7 @@ tostruct_hs_a(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       a->common.rdclass = rdata->rdclass;
-       a->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&a->common, link);
+       DNS_RDATACOMMON_INIT(a, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
        n = uint32_fromregion(&region);

diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c
index 540a21899fbbf5acdec826f80446372aab28feb4..db18ee0164d0033a588c42a58847c2f52442c63c 100644 (file)
--- a/lib/dns/rdata/in_1/a6_38.c
+++ b/lib/dns/rdata/in_1/a6_38.c
@@ -346,9 +346,7 @@ tostruct_in_a6(ARGS_TOSTRUCT) {
        REQUIRE(a6 != NULL);
        REQUIRE(rdata->length != 0);
 
-       a6->common.rdclass = rdata->rdclass;
-       a6->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&a6->common, link);
+       DNS_RDATACOMMON_INIT(a6, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &r);
 

diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c
index 6f7cf0967b6f8352ee264163a75746a351d36d34..ade8a8af6ae4dc8e967322907e0f302eac64cc00 100644 (file)
--- a/lib/dns/rdata/in_1/a_1.c
+++ b/lib/dns/rdata/in_1/a_1.c
@@ -160,9 +160,7 @@ tostruct_in_a(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       a->common.rdclass = rdata->rdclass;
-       a->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&a->common, link);
+       DNS_RDATACOMMON_INIT(a, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
        n = uint32_fromregion(&region);

diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c
index bad864915d6b093740e17d53ad75d41e1e52a2d6..b1a947882c57107fa934d0c25d1b2fb56a6468e9 100644 (file)
--- a/lib/dns/rdata/in_1/aaaa_28.c
+++ b/lib/dns/rdata/in_1/aaaa_28.c
@@ -172,9 +172,7 @@ tostruct_in_aaaa(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       aaaa->common.rdclass = rdata->rdclass;
-       aaaa->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&aaaa->common, link);
+       DNS_RDATACOMMON_INIT(aaaa, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &r);
        INSIST(r.length == 16);

diff --git a/lib/dns/rdata/in_1/apl_42.c b/lib/dns/rdata/in_1/apl_42.c
index c24eee4b85121c6aba5e09f312ddfda55da586df..9e9dd1826c9db8b964bce996fa3e3629d6a0d6cc 100644 (file)
--- a/lib/dns/rdata/in_1/apl_42.c
+++ b/lib/dns/rdata/in_1/apl_42.c
@@ -288,9 +288,7 @@ tostruct_in_apl(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_apl);
        REQUIRE(rdata->rdclass == dns_rdataclass_in);
 
-       apl->common.rdclass = rdata->rdclass;
-       apl->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&apl->common, link);
+       DNS_RDATACOMMON_INIT(apl, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &r);
        apl->apl_len = r.length;

diff --git a/lib/dns/rdata/in_1/atma_34.c b/lib/dns/rdata/in_1/atma_34.c
index a0a37c7c94bb9fea0af77743525f9b56c59edeb2..b7d35a1f0f43e2f8357628f93e46c2b508221af4 100644 (file)
--- a/lib/dns/rdata/in_1/atma_34.c
+++ b/lib/dns/rdata/in_1/atma_34.c
@@ -225,9 +225,7 @@ tostruct_in_atma(ARGS_TOSTRUCT) {
        REQUIRE(atma != NULL);
        REQUIRE(rdata->length != 0);
 
-       atma->common.rdclass = rdata->rdclass;
-       atma->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&atma->common, link);
+       DNS_RDATACOMMON_INIT(atma, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &r);
        atma->format = r.base[0];

diff --git a/lib/dns/rdata/in_1/dhcid_49.c b/lib/dns/rdata/in_1/dhcid_49.c
index 90376542f393e2960d9c6b7d94eea6fa75e3777c..e653aca7422716b9ad511a489b205647eea9a200 100644 (file)
--- a/lib/dns/rdata/in_1/dhcid_49.c
+++ b/lib/dns/rdata/in_1/dhcid_49.c
@@ -145,9 +145,7 @@ tostruct_in_dhcid(ARGS_TOSTRUCT) {
        REQUIRE(dhcid != NULL);
        REQUIRE(rdata->length != 0);
 
-       dhcid->common.rdclass = rdata->rdclass;
-       dhcid->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&dhcid->common, link);
+       DNS_RDATACOMMON_INIT(dhcid, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
 

diff --git a/lib/dns/rdata/in_1/eid_31.c b/lib/dns/rdata/in_1/eid_31.c
index 2bdccb8763d49e84d7c0c1d021b6ca8f165e8a0b..2728120d2f56dc77229a888deaaa793383e73692 100644 (file)
--- a/lib/dns/rdata/in_1/eid_31.c
+++ b/lib/dns/rdata/in_1/eid_31.c
@@ -134,9 +134,7 @@ tostruct_in_eid(ARGS_TOSTRUCT) {
        REQUIRE(eid != NULL);
        REQUIRE(rdata->length != 0);
 
-       eid->common.rdclass = rdata->rdclass;
-       eid->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&eid->common, link);
+       DNS_RDATACOMMON_INIT(eid, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &r);
        eid->eid_len = r.length;

diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index 8e29e53894fd2e4a309939a7cbd79e0d49820008..3c93d5e3436a245dc16557c5344fc1ea617ed6dd 100644 (file)
--- a/lib/dns/rdata/in_1/kx_36.c
+++ b/lib/dns/rdata/in_1/kx_36.c
@@ -188,9 +188,7 @@ tostruct_in_kx(ARGS_TOSTRUCT) {
        REQUIRE(kx != NULL);
        REQUIRE(rdata->length != 0);
 
-       kx->common.rdclass = rdata->rdclass;
-       kx->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&kx->common, link);
+       DNS_RDATACOMMON_INIT(kx, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/in_1/nimloc_32.c b/lib/dns/rdata/in_1/nimloc_32.c
index 01c6f8f1b19fd66b984150a832260e58d251e8bc..f2ba08ba2480cd0c28ff8a755cf378b4c9d1a96f 100644 (file)
--- a/lib/dns/rdata/in_1/nimloc_32.c
+++ b/lib/dns/rdata/in_1/nimloc_32.c
@@ -134,9 +134,7 @@ tostruct_in_nimloc(ARGS_TOSTRUCT) {
        REQUIRE(nimloc != NULL);
        REQUIRE(rdata->length != 0);
 
-       nimloc->common.rdclass = rdata->rdclass;
-       nimloc->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&nimloc->common, link);
+       DNS_RDATACOMMON_INIT(nimloc, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &r);
        nimloc->nimloc_len = r.length;

diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c
index b52046214265facdab45e02d3d9e8e0c16810eb1..386e26ade29791489aa121a0924a2382546c6759 100644 (file)
--- a/lib/dns/rdata/in_1/nsap-ptr_23.c
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.c
@@ -154,9 +154,7 @@ tostruct_in_nsap_ptr(ARGS_TOSTRUCT) {
        REQUIRE(nsap_ptr != NULL);
        REQUIRE(rdata->length != 0);
 
-       nsap_ptr->common.rdclass = rdata->rdclass;
-       nsap_ptr->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&nsap_ptr->common, link);
+       DNS_RDATACOMMON_INIT(nsap_ptr, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c
index f30819171f11ca401219eb64b7018b8169858d72..ccf2a7db63bc0f48103a2e8fcc99c94a87ac1b99 100644 (file)
--- a/lib/dns/rdata/in_1/nsap_22.c
+++ b/lib/dns/rdata/in_1/nsap_22.c
@@ -169,9 +169,7 @@ tostruct_in_nsap(ARGS_TOSTRUCT) {
        REQUIRE(nsap != NULL);
        REQUIRE(rdata->length != 0);
 
-       nsap->common.rdclass = rdata->rdclass;
-       nsap->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&nsap->common, link);
+       DNS_RDATACOMMON_INIT(nsap, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &r);
        nsap->nsap_len = r.length;

diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index 109bcc1f8f0cb6361a1ae226ce42bac601b618c3..83ad60ebc8221d8efb5f53ba6bd734dc6809f5e8 100644 (file)
--- a/lib/dns/rdata/in_1/px_26.c
+++ b/lib/dns/rdata/in_1/px_26.c
@@ -256,9 +256,7 @@ tostruct_in_px(ARGS_TOSTRUCT) {
        REQUIRE(px != NULL);
        REQUIRE(rdata->length != 0);
 
-       px->common.rdclass = rdata->rdclass;
-       px->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&px->common, link);
+       DNS_RDATACOMMON_INIT(px, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index 81d6ea8bb1bd02796c5b033492413e66e11e4495..47580052e41b8af71089b19124abfe612398bca7 100644 (file)
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -267,9 +267,7 @@ tostruct_in_srv(ARGS_TOSTRUCT) {
        REQUIRE(srv != NULL);
        REQUIRE(rdata->length != 0);
 
-       srv->common.rdclass = rdata->rdclass;
-       srv->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&srv->common, link);
+       DNS_RDATACOMMON_INIT(srv, rdata->type, rdata->rdclass);
 
        dns_name_init(&name, NULL);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/in_1/svcb_64.c b/lib/dns/rdata/in_1/svcb_64.c
index 3891ab766422673014c8d5f653d0898bfe94fbc2..bdb4d5188f6ec543f165f09c634a4f7b2034271f 100644 (file)
--- a/lib/dns/rdata/in_1/svcb_64.c
+++ b/lib/dns/rdata/in_1/svcb_64.c
@@ -1013,9 +1013,7 @@ generic_tostruct_in_svcb(ARGS_TOSTRUCT) {
        REQUIRE(svcb != NULL);
        REQUIRE(rdata->length != 0);
 
-       svcb->common.rdclass = rdata->rdclass;
-       svcb->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&svcb->common, link);
+       DNS_RDATACOMMON_INIT(svcb, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
 

diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index fa9229cbfa4a7db71a8de1656316390a4a43783d..6399683d94aac5790a6738e4ea3ea68d0b6fb096 100644 (file)
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -311,9 +311,7 @@ tostruct_in_wks(ARGS_TOSTRUCT) {
        REQUIRE(rdata->rdclass == dns_rdataclass_in);
        REQUIRE(rdata->length != 0);
 
-       wks->common.rdclass = rdata->rdclass;
-       wks->common.rdtype = rdata->type;
-       ISC_LINK_INIT(&wks->common, link);
+       DNS_RDATACOMMON_INIT(wks, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
        n = uint32_fromregion(&region);