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 a8628d2b3d06fbcc4819250f0c48c9795bcc6d65..2428ca26ff1e86a6bc6fc9cdb0b1b59258c4a4a4 100644 (file)
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -451,8 +451,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;
+       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 744922676392efda5eb35c847c08b4b74d3517c4..8a4d7d2833a0226497cb4301d4b77a5ef11852c0 100644 (file)
--- a/lib/dns/rdata/ch_3/a_1.c
+++ b/lib/dns/rdata/ch_3/a_1.c
@@ -226,8 +226,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;
+       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 5e0a7ef9d78aa6141969ce045e624035b34ee639..edbaa7b384b9b76726f017a946df186128d4630a 100644 (file)
--- a/lib/dns/rdata/generic/afsdb_18.c
+++ b/lib/dns/rdata/generic/afsdb_18.c
@@ -207,8 +207,7 @@ tostruct_afsdb(ARGS_TOSTRUCT) {
        REQUIRE(afsdb != NULL);
        REQUIRE(rdata->length != 0);
 
-       afsdb->common.rdclass = rdata->rdclass;
-       afsdb->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(afsdb, rdata->type, rdata->rdclass);
 
        dns_name_init(&afsdb->server);
 

diff --git a/lib/dns/rdata/generic/amtrelay_260.c b/lib/dns/rdata/generic/amtrelay_260.c
index 7b8e93bc6723a87ad8c8efe8a056561b07912a3f..c22a7d3fd62741d1db000bce526cd35ae9eeed72 100644 (file)
--- a/lib/dns/rdata/generic/amtrelay_260.c
+++ b/lib/dns/rdata/generic/amtrelay_260.c
@@ -311,8 +311,7 @@ tostruct_amtrelay(ARGS_TOSTRUCT) {
        REQUIRE(amtrelay != NULL);
        REQUIRE(rdata->length >= 2);
 
-       amtrelay->common.rdclass = rdata->rdclass;
-       amtrelay->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(amtrelay, rdata->type, rdata->rdclass);
 
        dns_name_init(&amtrelay->gateway);
        amtrelay->data = NULL;

diff --git a/lib/dns/rdata/generic/avc_258.c b/lib/dns/rdata/generic/avc_258.c
index 37dcdadce925e409134a3a19abeed45810197543..f19cb480e6529a2d25e0e230b913c127e1142972 100644 (file)
--- a/lib/dns/rdata/generic/avc_258.c
+++ b/lib/dns/rdata/generic/avc_258.c
@@ -75,8 +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;
+       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 2dbe8ab91cea157013e4955efc4a645c69d628c8..e1381b31a99cee56182f084b2d4529a3de8cb1f2 100644 (file)
--- a/lib/dns/rdata/generic/caa_257.c
+++ b/lib/dns/rdata/generic/caa_257.c
@@ -498,8 +498,7 @@ tostruct_caa(ARGS_TOSTRUCT) {
        REQUIRE(rdata->length >= 3U);
        REQUIRE(rdata->data != NULL);
 
-       caa->common.rdclass = rdata->rdclass;
-       caa->common.rdtype = rdata->type;
+       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 53b889770b3005d2d68ea24883225b818536d827..92bb1712eeba253f9214c95b0c26c6123fc7dec7 100644 (file)
--- a/lib/dns/rdata/generic/cdnskey_60.c
+++ b/lib/dns/rdata/generic/cdnskey_60.c
@@ -88,8 +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;
+       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 359ba812d421de6bcaaa79fd9e950e09d9340caa..d1ededbe4a47733256c113e30f3c2aa49b99f554 100644 (file)
--- a/lib/dns/rdata/generic/cds_59.c
+++ b/lib/dns/rdata/generic/cds_59.c
@@ -89,8 +89,7 @@ tostruct_cds(ARGS_TOSTRUCT) {
        /*
         * Checked by generic_tostruct_ds().
         */
-       cds->common.rdclass = rdata->rdclass;
-       cds->common.rdtype = rdata->type;
+       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 d1a9568f6b3943dc8044a3d0b557eca1a19c808f..138c29670203e2bab82fe33c183c6beaa1ce90c5 100644 (file)
--- a/lib/dns/rdata/generic/cert_37.c
+++ b/lib/dns/rdata/generic/cert_37.c
@@ -191,8 +191,7 @@ tostruct_cert(ARGS_TOSTRUCT) {
        REQUIRE(cert != NULL);
        REQUIRE(rdata->length != 0);
 
-       cert->common.rdclass = rdata->rdclass;
-       cert->common.rdtype = rdata->type;
+       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 fce7c57d380fcfdb565d6c7f36a3e143d48c12c6..57554ca978447423749e8db3c59597e1ce452492 100644 (file)
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -144,8 +144,7 @@ tostruct_cname(ARGS_TOSTRUCT) {
        REQUIRE(cname != NULL);
        REQUIRE(rdata->length != 0);
 
-       cname->common.rdclass = rdata->rdclass;
-       cname->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(cname, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/csync_62.c b/lib/dns/rdata/generic/csync_62.c
index 4b31a9ae8d782780d92e7ddcf4af7174da89ad50..10557aade768232a941ff3a7b58fe5cddd2572b6 100644 (file)
--- a/lib/dns/rdata/generic/csync_62.c
+++ b/lib/dns/rdata/generic/csync_62.c
@@ -168,8 +168,7 @@ tostruct_csync(ARGS_TOSTRUCT) {
        REQUIRE(csync != NULL);
        REQUIRE(rdata->length != 0);
 
-       csync->common.rdclass = rdata->rdclass;
-       csync->common.rdtype = rdata->type;
+       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 376a85004967d54db991eb1f4b7c7f10490f1aa8..8a0e7727e93ba5e761ba2f8ce29e7929ea5384e2 100644 (file)
--- a/lib/dns/rdata/generic/dlv_32769.c
+++ b/lib/dns/rdata/generic/dlv_32769.c
@@ -85,8 +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;
+       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 7df00d8ed069186bdf85a2ba2d08ef012bedbbb0..3254f3502cd235eed5139bec14bc378194513763 100644 (file)
--- a/lib/dns/rdata/generic/dname_39.c
+++ b/lib/dns/rdata/generic/dname_39.c
@@ -144,8 +144,7 @@ tostruct_dname(ARGS_TOSTRUCT) {
        REQUIRE(dname != NULL);
        REQUIRE(rdata->length != 0);
 
-       dname->common.rdclass = rdata->rdclass;
-       dname->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(dname, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/dnskey_48.c b/lib/dns/rdata/generic/dnskey_48.c
index 676df38746d705381192f6b110fd9bf9215d9442..aeb98fc507555fc57bbd38967f81fa00951c0d1c 100644 (file)
--- a/lib/dns/rdata/generic/dnskey_48.c
+++ b/lib/dns/rdata/generic/dnskey_48.c
@@ -89,8 +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;
+       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 d0da2a4492b039c11fa74efda4ea98303edff570..be926981f14c8337dffbd6cc03c9ff2cdd603f6a 100644 (file)
--- a/lib/dns/rdata/generic/doa_259.c
+++ b/lib/dns/rdata/generic/doa_259.c
@@ -214,8 +214,7 @@ tostruct_doa(ARGS_TOSTRUCT) {
        REQUIRE(doa != NULL);
        REQUIRE(rdata->length >= 10);
 
-       doa->common.rdclass = rdata->rdclass;
-       doa->common.rdtype = rdata->type;
+       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 e7373bb0cafedffcc412b520c9bd67e3514d23b3..d98b26434dfbe9a3e54754cc23cc7d51b91d574a 100644 (file)
--- a/lib/dns/rdata/generic/ds_43.c
+++ b/lib/dns/rdata/generic/ds_43.c
@@ -302,8 +302,7 @@ tostruct_ds(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_ds);
        REQUIRE(ds != NULL);
 
-       ds->common.rdclass = rdata->rdclass;
-       ds->common.rdtype = rdata->type;
+       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 ad2f9cb0216dcd601cdd4494d8b634e0f889ccf1..0242da3ed0323170e2154d2c92ebba695adafce6 100644 (file)
--- a/lib/dns/rdata/generic/dsync_66.c
+++ b/lib/dns/rdata/generic/dsync_66.c
@@ -254,8 +254,7 @@ tostruct_dsync(ARGS_TOSTRUCT) {
        REQUIRE(dsync != NULL);
        REQUIRE(rdata->length != 0);
 
-       dsync->common.rdclass = rdata->rdclass;
-       dsync->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(dsync, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/eui48_108.c b/lib/dns/rdata/generic/eui48_108.c
index b3b5ebe2b729cf64258e8eb25b564f1d246c0ef1..604e13f7f5e59dc6660419b60a55f30bd45a92c0 100644 (file)
--- a/lib/dns/rdata/generic/eui48_108.c
+++ b/lib/dns/rdata/generic/eui48_108.c
@@ -136,8 +136,7 @@ tostruct_eui48(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       eui48->common.rdclass = rdata->rdclass;
-       eui48->common.rdtype = rdata->type;
+       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 8ea9a3d7a02667ecc45f2400bf2bb362cf0b9af9..335dd5cd926e5bfd227ab85120ac98db10f77a25 100644 (file)
--- a/lib/dns/rdata/generic/eui64_109.c
+++ b/lib/dns/rdata/generic/eui64_109.c
@@ -139,8 +139,7 @@ tostruct_eui64(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       eui64->common.rdclass = rdata->rdclass;
-       eui64->common.rdtype = rdata->type;
+       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 cb51e8e49ed186b8d44c407d453c24bcf552ddbe..32a2284bbc5d7b17031fa0793f4dd8519f44684c 100644 (file)
--- a/lib/dns/rdata/generic/gpos_27.c
+++ b/lib/dns/rdata/generic/gpos_27.c
@@ -132,8 +132,7 @@ tostruct_gpos(ARGS_TOSTRUCT) {
        REQUIRE(gpos != NULL);
        REQUIRE(rdata->length != 0);
 
-       gpos->common.rdclass = rdata->rdclass;
-       gpos->common.rdtype = rdata->type;
+       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 867c5d05b5d05a56a050645ffb10474a0932148f..fde40b4bec81831071e29abdee1243732de64420 100644 (file)
--- a/lib/dns/rdata/generic/hinfo_13.c
+++ b/lib/dns/rdata/generic/hinfo_13.c
@@ -116,8 +116,7 @@ tostruct_hinfo(ARGS_TOSTRUCT) {
        REQUIRE(hinfo != NULL);
        REQUIRE(rdata->length != 0);
 
-       hinfo->common.rdclass = rdata->rdclass;
-       hinfo->common.rdtype = rdata->type;
+       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 39642c30a7fc3b43b51451e0156b0c5fd1f88d57..11528946838b4752f770f2587c650b716e5dddd7 100644 (file)
--- a/lib/dns/rdata/generic/hip_55.c
+++ b/lib/dns/rdata/generic/hip_55.c
@@ -303,8 +303,7 @@ tostruct_hip(ARGS_TOSTRUCT) {
        REQUIRE(hip != NULL);
        REQUIRE(rdata->length != 0);
 
-       hip->common.rdclass = rdata->rdclass;
-       hip->common.rdtype = rdata->type;
+       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 c46f776d4ed51b82b52a28779858927886774cc9..9d7c95845bbda5bfba3d62849e1f7db6b804b3c2 100644 (file)
--- a/lib/dns/rdata/generic/ipseckey_45.c
+++ b/lib/dns/rdata/generic/ipseckey_45.c
@@ -350,8 +350,7 @@ tostruct_ipseckey(ARGS_TOSTRUCT) {
        REQUIRE(ipseckey != NULL);
        REQUIRE(rdata->length >= 3);
 
-       ipseckey->common.rdclass = rdata->rdclass;
-       ipseckey->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(ipseckey, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c
index 8ed118781891e851782fe8deab8933669ac8cdb4..433527aa58d11e32c9a7e8e839d8b45dc5ca07e9 100644 (file)
--- a/lib/dns/rdata/generic/isdn_20.c
+++ b/lib/dns/rdata/generic/isdn_20.c
@@ -137,8 +137,7 @@ tostruct_isdn(ARGS_TOSTRUCT) {
        REQUIRE(isdn != NULL);
        REQUIRE(rdata->length != 0);
 
-       isdn->common.rdclass = rdata->rdclass;
-       isdn->common.rdtype = rdata->type;
+       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 e07e9ba279192e9699ac6bf62036c01e47326fb2..38b5a0603303d237c2ccdc343243797ed3f123e6 100644 (file)
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -414,8 +414,7 @@ tostruct_key(ARGS_TOSTRUCT) {
        REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_key);
 
-       key->common.rdclass = rdata->rdclass;
-       key->common.rdtype = rdata->type;
+       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 894d4129dd000091b569410c50f7360bcb0168c8..2a5d78cc232a772428a2ebc36afc3835263a23a1 100644 (file)
--- a/lib/dns/rdata/generic/keydata_65533.c
+++ b/lib/dns/rdata/generic/keydata_65533.c
@@ -330,8 +330,7 @@ tostruct_keydata(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_keydata);
        REQUIRE(keydata != NULL);
 
-       keydata->common.rdclass = rdata->rdclass;
-       keydata->common.rdtype = rdata->type;
+       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 3b9aeaa9128a1cdf10f720e2d557b252e039cf9e..9657711bb83de0cfb5118756be18e0a837f8c92f 100644 (file)
--- a/lib/dns/rdata/generic/l32_105.c
+++ b/lib/dns/rdata/generic/l32_105.c
@@ -152,8 +152,7 @@ tostruct_l32(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       l32->common.rdclass = rdata->rdclass;
-       l32->common.rdtype = rdata->type;
+       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 96ca5c3222c7babbde393cf192e8cb7354905ed6..5e9b42e451bf33e3e783cd8af2a018d83277c670 100644 (file)
--- a/lib/dns/rdata/generic/l64_106.c
+++ b/lib/dns/rdata/generic/l64_106.c
@@ -147,8 +147,7 @@ tostruct_l64(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       l64->common.rdclass = rdata->rdclass;
-       l64->common.rdtype = rdata->type;
+       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 516347536b799378a3034d0b22e30b17b6cfbf19..5bd08be93bba5bf23360140ba8c93762b9ccd5f8 100644 (file)
--- a/lib/dns/rdata/generic/loc_29.c
+++ b/lib/dns/rdata/generic/loc_29.c
@@ -752,8 +752,7 @@ tostruct_loc(ARGS_TOSTRUCT) {
                return ISC_R_NOTIMPLEMENTED;
        }
 
-       loc->common.rdclass = rdata->rdclass;
-       loc->common.rdtype = rdata->type;
+       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 9eb0f7827981641e55fdb7b964d779f2d9f0bc98..1351ab420f2b5a988aee1cb39a25bd7ee55bcae4 100644 (file)
--- a/lib/dns/rdata/generic/lp_107.c
+++ b/lib/dns/rdata/generic/lp_107.c
@@ -155,8 +155,7 @@ tostruct_lp(ARGS_TOSTRUCT) {
        REQUIRE(lp != NULL);
        REQUIRE(rdata->length != 0);
 
-       lp->common.rdclass = rdata->rdclass;
-       lp->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(lp, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index 78120665d414cde155fb13cf39ddf5673cc26600..9282507d1593286297eef377929d588c58e3a630 100644 (file)
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -143,8 +143,7 @@ tostruct_mb(ARGS_TOSTRUCT) {
        REQUIRE(mb != NULL);
        REQUIRE(rdata->length != 0);
 
-       mb->common.rdclass = rdata->rdclass;
-       mb->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(mb, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index 26ace0eade49f6058d97fdc57f493ef7a30554ff..86633d375f008c4b48bcb5a854651a34d2738b34 100644 (file)
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -143,8 +143,7 @@ tostruct_md(ARGS_TOSTRUCT) {
        REQUIRE(md != NULL);
        REQUIRE(rdata->length != 0);
 
-       md->common.rdclass = rdata->rdclass;
-       md->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(md, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &r);

diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index af4dc0cb1fe7500b2dca12c67af3e78394123de0..cd1b69df83a78c32e50637eb107d0a45f3e5d83c 100644 (file)
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -143,8 +143,7 @@ tostruct_mf(ARGS_TOSTRUCT) {
        REQUIRE(mf != NULL);
        REQUIRE(rdata->length != 0);
 
-       mf->common.rdclass = rdata->rdclass;
-       mf->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(mf, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &r);

diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c
index 2828ff214f029c5aea79b3903160afa725a134f5..f167eaaedde285fd46f20dacdd63baa1d673a35b 100644 (file)
--- a/lib/dns/rdata/generic/mg_8.c
+++ b/lib/dns/rdata/generic/mg_8.c
@@ -143,8 +143,7 @@ tostruct_mg(ARGS_TOSTRUCT) {
        REQUIRE(mg != NULL);
        REQUIRE(rdata->length != 0);
 
-       mg->common.rdclass = rdata->rdclass;
-       mg->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(mg, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c
index e9ffcd4f0c76b4a75d3f188a8f0348ec9615bad4..2eb8036d9fead43920de4f9ba9ab289f27cb8869 100644 (file)
--- a/lib/dns/rdata/generic/minfo_14.c
+++ b/lib/dns/rdata/generic/minfo_14.c
@@ -207,8 +207,7 @@ tostruct_minfo(ARGS_TOSTRUCT) {
        REQUIRE(minfo != NULL);
        REQUIRE(rdata->length != 0);
 
-       minfo->common.rdclass = rdata->rdclass;
-       minfo->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(minfo, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c
index 02384fc97889b2fa87c2cfe62602489d0656d215..d38c73ac4e516a7f18abb243fc51d234a02241a5 100644 (file)
--- a/lib/dns/rdata/generic/mr_9.c
+++ b/lib/dns/rdata/generic/mr_9.c
@@ -143,8 +143,7 @@ tostruct_mr(ARGS_TOSTRUCT) {
        REQUIRE(mr != NULL);
        REQUIRE(rdata->length != 0);
 
-       mr->common.rdclass = rdata->rdclass;
-       mr->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(mr, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

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

diff --git a/lib/dns/rdata/generic/naptr_35.c b/lib/dns/rdata/generic/naptr_35.c
index 44c95aee9160ab2b73c1592d70f7761647b4b422..8f9f9b61ca624f47168778a3f223d889d9c3e601 100644 (file)
--- a/lib/dns/rdata/generic/naptr_35.c
+++ b/lib/dns/rdata/generic/naptr_35.c
@@ -499,8 +499,7 @@ tostruct_naptr(ARGS_TOSTRUCT) {
        REQUIRE(naptr != NULL);
        REQUIRE(rdata->length != 0);
 
-       naptr->common.rdclass = rdata->rdclass;
-       naptr->common.rdtype = rdata->type;
+       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 99415feb02de7d3f91bc8a7b950281ba3cd17bb6..80d0533057991520632d726792dcbf6ca7fa1b90 100644 (file)
--- a/lib/dns/rdata/generic/nid_104.c
+++ b/lib/dns/rdata/generic/nid_104.c
@@ -147,8 +147,7 @@ tostruct_nid(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       nid->common.rdclass = rdata->rdclass;
-       nid->common.rdtype = rdata->type;
+       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 e82488221f560cb3959d7ff07f9430a76489c6b2..100acdcf4609281dfd8986ec97b5423aaaeda8b6 100644 (file)
--- a/lib/dns/rdata/generic/ninfo_56.c
+++ b/lib/dns/rdata/generic/ninfo_56.c
@@ -75,8 +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;
+       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 5bc32b1bca8118d5175c798447be92345582f918..5508c2e6c71eb733bb06f51468210173e326f39c 100644 (file)
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -157,8 +157,7 @@ tostruct_ns(ARGS_TOSTRUCT) {
        REQUIRE(ns != NULL);
        REQUIRE(rdata->length != 0);
 
-       ns->common.rdclass = rdata->rdclass;
-       ns->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(ns, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/nsec3_50.c b/lib/dns/rdata/generic/nsec3_50.c
index 31a461c8a36ee16a5d3d221d466af9354f381bf8..600a90f9bd9341740a1ed72967414409ac2d8fad 100644 (file)
--- a/lib/dns/rdata/generic/nsec3_50.c
+++ b/lib/dns/rdata/generic/nsec3_50.c
@@ -292,8 +292,7 @@ tostruct_nsec3(ARGS_TOSTRUCT) {
        REQUIRE(nsec3 != NULL);
        REQUIRE(rdata->length != 0);
 
-       nsec3->common.rdclass = rdata->rdclass;
-       nsec3->common.rdtype = rdata->type;
+       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 ecf78a1b92eb09b016a8574825623a9ad02953b5..e1b8effe8b0445f186944183a6e7690805b4265c 100644 (file)
--- a/lib/dns/rdata/generic/nsec3param_51.c
+++ b/lib/dns/rdata/generic/nsec3param_51.c
@@ -228,8 +228,7 @@ tostruct_nsec3param(ARGS_TOSTRUCT) {
        REQUIRE(nsec3param != NULL);
        REQUIRE(rdata->length != 0);
 
-       nsec3param->common.rdclass = rdata->rdclass;
-       nsec3param->common.rdtype = rdata->type;
+       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 b9ddeaffe24018e2cd96bbfee903f281e23e94db..e850dfb9e37136e6fc52b44be4514653c8d44418 100644 (file)
--- a/lib/dns/rdata/generic/nsec_47.c
+++ b/lib/dns/rdata/generic/nsec_47.c
@@ -162,8 +162,7 @@ tostruct_nsec(ARGS_TOSTRUCT) {
        REQUIRE(nsec != NULL);
        REQUIRE(rdata->length != 0);
 
-       nsec->common.rdclass = rdata->rdclass;
-       nsec->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(nsec, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c
index f063c10eb0f0c35424d7b8929dba6ab0bbe8e347..2967a556a1e6341ff39076e923e089a1908b82db 100644 (file)
--- a/lib/dns/rdata/generic/null_10.c
+++ b/lib/dns/rdata/generic/null_10.c
@@ -100,8 +100,7 @@ tostruct_null(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_null);
        REQUIRE(null != NULL);
 
-       null->common.rdclass = rdata->rdclass;
-       null->common.rdtype = rdata->type;
+       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 919db91d7b750125d1e6dcc909bbf7a3d328035c..95bd1e8de8a01a15e38c5e9314d86ee2fc1f2ca7 100644 (file)
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -241,8 +241,7 @@ tostruct_nxt(ARGS_TOSTRUCT) {
        REQUIRE(nxt != NULL);
        REQUIRE(rdata->length != 0);
 
-       nxt->common.rdclass = rdata->rdclass;
-       nxt->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(nxt, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/openpgpkey_61.c b/lib/dns/rdata/generic/openpgpkey_61.c
index 2d92221dddd48ba7d52950a3726d8e65cb5c4608..9ccfaeef75c897d02fb80e6bd8466dc1d41b6cfd 100644 (file)
--- a/lib/dns/rdata/generic/openpgpkey_61.c
+++ b/lib/dns/rdata/generic/openpgpkey_61.c
@@ -144,8 +144,7 @@ tostruct_openpgpkey(ARGS_TOSTRUCT) {
        REQUIRE(sig != NULL);
        REQUIRE(rdata->length != 0);
 
-       sig->common.rdclass = rdata->rdclass;
-       sig->common.rdtype = rdata->type;
+       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 5ba5be9e97417b7eaa1904dbce3c9b98a5f98d2a..b71128b674946214f55f18bc7c9ec52ba8dbbb10 100644 (file)
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -364,8 +364,7 @@ tostruct_opt(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_opt);
        REQUIRE(opt != NULL);
 
-       opt->common.rdclass = rdata->rdclass;
-       opt->common.rdtype = rdata->type;
+       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 2dac4e9839063a3880a1117f2ffb030cc8027ea6..bed80171e83521511f23010209385673846a2521 100644 (file)
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -161,8 +161,7 @@ tostruct_ptr(ARGS_TOSTRUCT) {
        REQUIRE(ptr != NULL);
        REQUIRE(rdata->length != 0);
 
-       ptr->common.rdclass = rdata->rdclass;
-       ptr->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(ptr, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/resinfo_261.c b/lib/dns/rdata/generic/resinfo_261.c
index 0e35f2365e1f1068ad8834247d0ec2ef318366af..a34895c7a90b346850c45eac4c4d635b2e1efb45 100644 (file)
--- a/lib/dns/rdata/generic/resinfo_261.c
+++ b/lib/dns/rdata/generic/resinfo_261.c
@@ -76,8 +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;
+       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 fb75ac5df1506ec68b02065b69ff9b01cf68705c..e2882f68eacbcde65673b833fc967a81065fe669 100644 (file)
--- a/lib/dns/rdata/generic/rkey_57.c
+++ b/lib/dns/rdata/generic/rkey_57.c
@@ -85,8 +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;
+       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 9e783e1aec30fd0bec6f4cccd2ce13788a05eb2e..ee1b68389519af0d282594cd4b317b1ec3f57d51 100644 (file)
--- a/lib/dns/rdata/generic/rp_17.c
+++ b/lib/dns/rdata/generic/rp_17.c
@@ -210,8 +210,7 @@ tostruct_rp(ARGS_TOSTRUCT) {
        REQUIRE(rp != NULL);
        REQUIRE(rdata->length != 0);
 
-       rp->common.rdclass = rdata->rdclass;
-       rp->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(rp, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c
index 09afc31805159db592474f529c0e5e40703e1424..f9980a764649a7643af4a5d44297f03e45ef75ce 100644 (file)
--- a/lib/dns/rdata/generic/rrsig_46.c
+++ b/lib/dns/rdata/generic/rrsig_46.c
@@ -497,8 +497,7 @@ tostruct_rrsig(ARGS_TOSTRUCT) {
        REQUIRE(sig != NULL);
        REQUIRE(rdata->length != 0);
 
-       sig->common.rdclass = rdata->rdclass;
-       sig->common.rdtype = rdata->type;
+       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 a225ace96ce0a900a004ef6a9982c655701da721..1138fb75250c647749fa0e4db86bc4fa0d634fe6 100644 (file)
--- a/lib/dns/rdata/generic/rt_21.c
+++ b/lib/dns/rdata/generic/rt_21.c
@@ -206,8 +206,7 @@ tostruct_rt(ARGS_TOSTRUCT) {
        REQUIRE(rt != NULL);
        REQUIRE(rdata->length != 0);
 
-       rt->common.rdclass = rdata->rdclass;
-       rt->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(rt, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        dns_rdata_toregion(rdata, &region);

diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index 2d5d8285771c75a36f25f999a93a0f28157cac40..8d95e6320742c1c3348aaf65527ff2c4c35d7542 100644 (file)
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -461,8 +461,7 @@ tostruct_sig(ARGS_TOSTRUCT) {
        REQUIRE(sig != NULL);
        REQUIRE(rdata->length != 0);
 
-       sig->common.rdclass = rdata->rdclass;
-       sig->common.rdtype = rdata->type;
+       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 41fc4bef2c4544b658260965621c5cb950230ea7..4ce1cf8808d2516e592da671da94e3a863d8c7aa 100644 (file)
--- a/lib/dns/rdata/generic/sink_40.c
+++ b/lib/dns/rdata/generic/sink_40.c
@@ -183,8 +183,7 @@ tostruct_sink(ARGS_TOSTRUCT) {
        REQUIRE(sink != NULL);
        REQUIRE(rdata->length >= 3);
 
-       sink->common.rdclass = rdata->rdclass;
-       sink->common.rdtype = rdata->type;
+       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 7d10efd87276d43e64de8d2dd61ba913c552bce1..2ddcab81f8f48ffafb4095b3d2a1416fe01d751c 100644 (file)
--- a/lib/dns/rdata/generic/smimea_53.c
+++ b/lib/dns/rdata/generic/smimea_53.c
@@ -82,8 +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;
+       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 9c5a04eecdaa183c769242c7300fa82b6f20ecf7..bb314b824e74859b61135c54597e8e0cc5a065dd 100644 (file)
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -312,8 +312,7 @@ tostruct_soa(ARGS_TOSTRUCT) {
        REQUIRE(soa != NULL);
        REQUIRE(rdata->length != 0);
 
-       soa->common.rdclass = rdata->rdclass;
-       soa->common.rdtype = rdata->type;
+       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 ff598583df18dd953592b1192ccdf1b7aec25eec..39918605512d0541a979be2b7a6b500fbb10305e 100644 (file)
--- a/lib/dns/rdata/generic/spf_99.c
+++ b/lib/dns/rdata/generic/spf_99.c
@@ -76,8 +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;
+       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 78fc02181f7ef93b9f95081164fc70a679c771e2..fc35f54de0118d248d510f5031530e1eef745000 100644 (file)
--- a/lib/dns/rdata/generic/sshfp_44.c
+++ b/lib/dns/rdata/generic/sshfp_44.c
@@ -204,8 +204,7 @@ tostruct_sshfp(ARGS_TOSTRUCT) {
        REQUIRE(sshfp != NULL);
        REQUIRE(rdata->length != 0);
 
-       sshfp->common.rdclass = rdata->rdclass;
-       sshfp->common.rdtype = rdata->type;
+       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 e816bfc29af641ddf48df019105ef2d73f49b360..151f6b500cee249288af58c7a0fa8ffcf150ccf9 100644 (file)
--- a/lib/dns/rdata/generic/ta_32768.c
+++ b/lib/dns/rdata/generic/ta_32768.c
@@ -85,8 +85,7 @@ tostruct_ta(ARGS_TOSTRUCT) {
        /*
         * Checked by generic_tostruct_ds().
         */
-       ds->common.rdclass = rdata->rdclass;
-       ds->common.rdtype = rdata->type;
+       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 943448d4f6d9ad2d39c55d661712e13a7ce528d1..b315b38aec1214ef13d8f307c2525d8ae4440e22 100644 (file)
--- a/lib/dns/rdata/generic/talink_58.c
+++ b/lib/dns/rdata/generic/talink_58.c
@@ -166,8 +166,7 @@ tostruct_talink(ARGS_TOSTRUCT) {
        REQUIRE(talink != NULL);
        REQUIRE(rdata->length != 0);
 
-       talink->common.rdclass = rdata->rdclass;
-       talink->common.rdtype = rdata->type;
+       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 35a371c1bd94493f7638cae535b015e3880e6f28..a2a44cb666828728b7fb7267350065fd5981566e 100644 (file)
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -423,8 +423,7 @@ tostruct_tkey(ARGS_TOSTRUCT) {
        REQUIRE(tkey != NULL);
        REQUIRE(rdata->length != 0);
 
-       tkey->common.rdclass = rdata->rdclass;
-       tkey->common.rdtype = rdata->type;
+       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 da978b0e975b935ff82fd76062cccc395758b4d4..c28189a81de3095da30f96525528d05c169816b0 100644 (file)
--- a/lib/dns/rdata/generic/tlsa_52.c
+++ b/lib/dns/rdata/generic/tlsa_52.c
@@ -263,8 +263,7 @@ tostruct_tlsa(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_tlsa);
        REQUIRE(tlsa != NULL);
 
-       tlsa->common.rdclass = rdata->rdclass;
-       tlsa->common.rdtype = rdata->type;
+       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 7a75d5cf5ad3d4a41afac2eb0a4748cfc5b37723..b61ee8889cdb123188285af1ee2e38725e4f19ee 100644 (file)
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -206,8 +206,7 @@ tostruct_txt(ARGS_TOSTRUCT) {
        REQUIRE(rdata->type == dns_rdatatype_txt);
        REQUIRE(txt != NULL);
 
-       txt->common.rdclass = rdata->rdclass;
-       txt->common.rdtype = rdata->type;
+       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 bb197df9a80973bee34095b9dcc77d6737c554f5..f948f5006be63bbc7bc4096eda60766f6fcc7656 100644 (file)
--- a/lib/dns/rdata/generic/uri_256.c
+++ b/lib/dns/rdata/generic/uri_256.c
@@ -210,8 +210,7 @@ tostruct_uri(ARGS_TOSTRUCT) {
        REQUIRE(uri != NULL);
        REQUIRE(rdata->length >= 4);
 
-       uri->common.rdclass = rdata->rdclass;
-       uri->common.rdtype = rdata->type;
+       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 9cd4cf8ab768802fc75ecaffecc1bed192072290..0cab8ee3b1721062b66b59b532483e011392777f 100644 (file)
--- a/lib/dns/rdata/generic/wallet_262.c
+++ b/lib/dns/rdata/generic/wallet_262.c
@@ -75,8 +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;
+       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 c8f5ba445a3336a8b939b721a14fa653ba8c66e7..34e8ed53e2db7551d9c548a09e48a513c915cb5a 100644 (file)
--- a/lib/dns/rdata/generic/x25_19.c
+++ b/lib/dns/rdata/generic/x25_19.c
@@ -145,8 +145,7 @@ tostruct_x25(ARGS_TOSTRUCT) {
        REQUIRE(x25 != NULL);
        REQUIRE(rdata->length != 0);
 
-       x25->common.rdclass = rdata->rdclass;
-       x25->common.rdtype = rdata->type;
+       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 2b8f701427ab1a0790c4c386362e764dac3c981f..02a90dbd92a14d2d9a7fcda8862395b1f7d77097 100644 (file)
--- a/lib/dns/rdata/generic/zonemd_63.c
+++ b/lib/dns/rdata/generic/zonemd_63.c
@@ -256,8 +256,7 @@ tostruct_zonemd(ARGS_TOSTRUCT) {
        REQUIRE(zonemd != NULL);
        REQUIRE(rdata->length != 0);
 
-       zonemd->common.rdclass = rdata->rdclass;
-       zonemd->common.rdtype = rdata->type;
+       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 35034052e3102437a4fee96227eea7f48aad7e05..a516a6f34519989db9ca12dfbe71483ae19aaeea 100644 (file)
--- a/lib/dns/rdata/hs_4/a_1.c
+++ b/lib/dns/rdata/hs_4/a_1.c
@@ -158,8 +158,7 @@ tostruct_hs_a(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       a->common.rdclass = rdata->rdclass;
-       a->common.rdtype = rdata->type;
+       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 34e118fb4a19ee8b4b3f30b2dc9ca50498b3ce42..e6c14ed74b0e17ce77968aee3d857ffa448d322b 100644 (file)
--- a/lib/dns/rdata/in_1/a6_38.c
+++ b/lib/dns/rdata/in_1/a6_38.c
@@ -349,8 +349,7 @@ tostruct_in_a6(ARGS_TOSTRUCT) {
        REQUIRE(a6 != NULL);
        REQUIRE(rdata->length != 0);
 
-       a6->common.rdclass = rdata->rdclass;
-       a6->common.rdtype = rdata->type;
+       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 68419a1f46e47ab92e370ebc8c51cbb8b16a4edd..1b1f6f02fc29d39702b1d63f5c2704f1bda495f3 100644 (file)
--- a/lib/dns/rdata/in_1/a_1.c
+++ b/lib/dns/rdata/in_1/a_1.c
@@ -159,8 +159,7 @@ tostruct_in_a(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       a->common.rdclass = rdata->rdclass;
-       a->common.rdtype = rdata->type;
+       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 72324f001053406d6286df61f6a1ba3460d757a3..9da515c008416c7077e40866c8622053e075a7d7 100644 (file)
--- a/lib/dns/rdata/in_1/aaaa_28.c
+++ b/lib/dns/rdata/in_1/aaaa_28.c
@@ -171,8 +171,7 @@ tostruct_in_aaaa(ARGS_TOSTRUCT) {
 
        UNUSED(mctx);
 
-       aaaa->common.rdclass = rdata->rdclass;
-       aaaa->common.rdtype = rdata->type;
+       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 fc8f115c9133ef1ba4146d1a3c65458c32f8734d..67c021062b6c40e68fdab4309a655b8a0c72afdb 100644 (file)
--- a/lib/dns/rdata/in_1/apl_42.c
+++ b/lib/dns/rdata/in_1/apl_42.c
@@ -288,8 +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;
+       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 9f0d5aca8695c22d8a5ba2b3a8dc9be309503992..d4cf53e2bcf579710895251919e3884e8a5761de 100644 (file)
--- a/lib/dns/rdata/in_1/atma_34.c
+++ b/lib/dns/rdata/in_1/atma_34.c
@@ -224,8 +224,7 @@ tostruct_in_atma(ARGS_TOSTRUCT) {
        REQUIRE(atma != NULL);
        REQUIRE(rdata->length != 0);
 
-       atma->common.rdclass = rdata->rdclass;
-       atma->common.rdtype = rdata->type;
+       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 fc18e8bb06fa88ab1a50488d63d98c68f2ce44b9..6f2b9dfb9fee58ac36c6d9bd57592a20367e5c8c 100644 (file)
--- a/lib/dns/rdata/in_1/dhcid_49.c
+++ b/lib/dns/rdata/in_1/dhcid_49.c
@@ -144,8 +144,7 @@ tostruct_in_dhcid(ARGS_TOSTRUCT) {
        REQUIRE(dhcid != NULL);
        REQUIRE(rdata->length != 0);
 
-       dhcid->common.rdclass = rdata->rdclass;
-       dhcid->common.rdtype = rdata->type;
+       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 2cafb78903745883ef250c2182d532a719a1b1fd..0cbad9ae4c6623d8b130f95e7064a7008ae57bce 100644 (file)
--- a/lib/dns/rdata/in_1/eid_31.c
+++ b/lib/dns/rdata/in_1/eid_31.c
@@ -133,8 +133,7 @@ tostruct_in_eid(ARGS_TOSTRUCT) {
        REQUIRE(eid != NULL);
        REQUIRE(rdata->length != 0);
 
-       eid->common.rdclass = rdata->rdclass;
-       eid->common.rdtype = rdata->type;
+       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 0ba015abff55564a1dfcf94f2e60af80116003bf..60ba17e558ac4a38eee77af0ed908d8f0b449fb7 100644 (file)
--- a/lib/dns/rdata/in_1/kx_36.c
+++ b/lib/dns/rdata/in_1/kx_36.c
@@ -186,8 +186,7 @@ tostruct_in_kx(ARGS_TOSTRUCT) {
        REQUIRE(kx != NULL);
        REQUIRE(rdata->length != 0);
 
-       kx->common.rdclass = rdata->rdclass;
-       kx->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(kx, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        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 ad8b45fb6930e76d78d12affdffde73868a96956..80ce2bd55966a43dc8c1a8e558bc49c76bf8a381 100644 (file)
--- a/lib/dns/rdata/in_1/nimloc_32.c
+++ b/lib/dns/rdata/in_1/nimloc_32.c
@@ -133,8 +133,7 @@ tostruct_in_nimloc(ARGS_TOSTRUCT) {
        REQUIRE(nimloc != NULL);
        REQUIRE(rdata->length != 0);
 
-       nimloc->common.rdclass = rdata->rdclass;
-       nimloc->common.rdtype = rdata->type;
+       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 a710bc982fbc5eb63fa030d4be0fc750bb13006d..de94aaab24e3a2cd976f78fe6d0015ed3efccadd 100644 (file)
--- a/lib/dns/rdata/in_1/nsap-ptr_23.c
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.c
@@ -151,8 +151,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;
+       DNS_RDATACOMMON_INIT(nsap_ptr, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        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 5b88479d4c731f00177999688dfee49897cf5201..b880d8f094d7b71b97754637dceb6ea93f7ffbb5 100644 (file)
--- a/lib/dns/rdata/in_1/nsap_22.c
+++ b/lib/dns/rdata/in_1/nsap_22.c
@@ -168,8 +168,7 @@ tostruct_in_nsap(ARGS_TOSTRUCT) {
        REQUIRE(nsap != NULL);
        REQUIRE(rdata->length != 0);
 
-       nsap->common.rdclass = rdata->rdclass;
-       nsap->common.rdtype = rdata->type;
+       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 68b2b9c49fbeda10a9c559ced9090ead55efc3be..46e82202d4d4e69d849654178df6d2949717cae5 100644 (file)
--- a/lib/dns/rdata/in_1/px_26.c
+++ b/lib/dns/rdata/in_1/px_26.c
@@ -254,8 +254,7 @@ tostruct_in_px(ARGS_TOSTRUCT) {
        REQUIRE(px != NULL);
        REQUIRE(rdata->length != 0);
 
-       px->common.rdclass = rdata->rdclass;
-       px->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(px, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        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 b436245ddb610b4009d6aebe0977db7f7db3f7d4..c0b2cf86e3f2c65a38ed424eac010f777bee4850 100644 (file)
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -270,8 +270,7 @@ tostruct_in_srv(ARGS_TOSTRUCT) {
        REQUIRE(srv != NULL);
        REQUIRE(rdata->length != 0);
 
-       srv->common.rdclass = rdata->rdclass;
-       srv->common.rdtype = rdata->type;
+       DNS_RDATACOMMON_INIT(srv, rdata->type, rdata->rdclass);
 
        dns_name_init(&name);
        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 4965d7333aa2cc5c2f7341dbece33dd9664e79b0..04f41ec268cb39af82dfc07c44e8dab3b06c1a43 100644 (file)
--- a/lib/dns/rdata/in_1/svcb_64.c
+++ b/lib/dns/rdata/in_1/svcb_64.c
@@ -1019,8 +1019,7 @@ generic_tostruct_in_svcb(ARGS_TOSTRUCT) {
        REQUIRE(svcb != NULL);
        REQUIRE(rdata->length != 0);
 
-       svcb->common.rdclass = rdata->rdclass;
-       svcb->common.rdtype = rdata->type;
+       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 bc98ebdbbc714dd6eb6ceff770bdc785af334718..8c980d4bc3c188776146eadab5289203fbe40cf6 100644 (file)
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -305,8 +305,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;
+       DNS_RDATACOMMON_INIT(wks, rdata->type, rdata->rdclass);
 
        dns_rdata_toregion(rdata, &region);
        n = uint32_fromregion(&region);