upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-23 02:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use DNS_RDATACOMMON_INIT to hide branch differences

Browse source 
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.
This commit is contained in:
Mark Andrews 2025-08-06 15:28:39 +10:00
parent 90e50ce683
commit 841d1647d4
85 changed files with 85 additions and 170 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/dns/rdata/any_255/tsig_250.c
View file

@ -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);

3
lib/dns/rdata/ch_3/a_1.c
View file

@ -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);

3
lib/dns/rdata/generic/afsdb_18.c
View file

@ -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);

3
lib/dns/rdata/generic/amtrelay_260.c
View file

@ -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;

3
lib/dns/rdata/generic/avc_258.c
View file

@ -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);
}

3
lib/dns/rdata/generic/caa_257.c
View file

@ -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);

3
lib/dns/rdata/generic/cdnskey_60.c
View file

@ -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);
}

3
lib/dns/rdata/generic/cds_59.c
View file

@ -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);
}

3
lib/dns/rdata/generic/cert_37.c
View file

@ -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);

3
lib/dns/rdata/generic/cname_5.c
View file

@ -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);

3
lib/dns/rdata/generic/csync_62.c
View file

@ -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);

3
lib/dns/rdata/generic/dlv_32769.c
View file

@ -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);
}

3
lib/dns/rdata/generic/dname_39.c
View file

@ -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);

3
lib/dns/rdata/generic/dnskey_48.c
View file

@ -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);
}

3
lib/dns/rdata/generic/doa_259.c
View file

@ -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);

3
lib/dns/rdata/generic/ds_43.c
View file

@ -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);
}

3
lib/dns/rdata/generic/dsync_66.c
View file

@ -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);

3
lib/dns/rdata/generic/eui48_108.c
View file

@ -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;

3
lib/dns/rdata/generic/eui64_109.c
View file

@ -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;

3
lib/dns/rdata/generic/gpos_27.c
View file

@ -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);

3
lib/dns/rdata/generic/hinfo_13.c
View file

@ -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);

3
lib/dns/rdata/generic/hip_55.c
View file

@ -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);

3
lib/dns/rdata/generic/ipseckey_45.c
View file

@ -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);

3
lib/dns/rdata/generic/isdn_20.c
View file

@ -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);

3
lib/dns/rdata/generic/key_25.c
View file

@ -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);
}

3
lib/dns/rdata/generic/keydata_65533.c
View file

@ -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);

3
lib/dns/rdata/generic/l32_105.c
View file

@ -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);

3
lib/dns/rdata/generic/l64_106.c
View file

@ -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);

3
lib/dns/rdata/generic/loc_29.c
View file

@ -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);

3
lib/dns/rdata/generic/lp_107.c
View file

@ -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);

3
lib/dns/rdata/generic/mb_7.c
View file

@ -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);

3
lib/dns/rdata/generic/md_3.c
View file

@ -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);

3
lib/dns/rdata/generic/mf_4.c
View file

@ -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);

3
lib/dns/rdata/generic/mg_8.c
View file

@ -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);

3
lib/dns/rdata/generic/minfo_14.c
View file

@ -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);

3
lib/dns/rdata/generic/mr_9.c
View file

@ -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);

3
lib/dns/rdata/generic/mx_15.c
View file

@ -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);

3
lib/dns/rdata/generic/naptr_35.c
View file

@ -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;

3
lib/dns/rdata/generic/nid_104.c
View file

@ -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);

3
lib/dns/rdata/generic/ninfo_56.c
View file

@ -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);
}

3
lib/dns/rdata/generic/ns_2.c
View file

@ -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);

3
lib/dns/rdata/generic/nsec3_50.c
View file

@ -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;

3
lib/dns/rdata/generic/nsec3param_51.c
View file

@ -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;

3
lib/dns/rdata/generic/nsec_47.c
View file

@ -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);

3
lib/dns/rdata/generic/null_10.c
View file

@ -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;

3
lib/dns/rdata/generic/nxt_30.c
View file

@ -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);

3
lib/dns/rdata/generic/openpgpkey_61.c
View file

@ -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);

3
lib/dns/rdata/generic/opt_41.c
View file

@ -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;

3
lib/dns/rdata/generic/ptr_12.c
View file

@ -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);

3
lib/dns/rdata/generic/resinfo_261.c
View file

@ -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);
}

3
lib/dns/rdata/generic/rkey_57.c
View file

@ -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);
}

3
lib/dns/rdata/generic/rp_17.c
View file

@ -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);

3
lib/dns/rdata/generic/rrsig_46.c
View file

@ -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);

3
lib/dns/rdata/generic/rt_21.c
View file

@ -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);

3
lib/dns/rdata/generic/sig_24.c
View file

@ -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);

3
lib/dns/rdata/generic/sink_40.c
View file

@ -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);

3
lib/dns/rdata/generic/smimea_53.c
View file

@ -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);
}

3
lib/dns/rdata/generic/soa_6.c
View file

@ -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);

3
lib/dns/rdata/generic/spf_99.c
View file

@ -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);
}

3
lib/dns/rdata/generic/sshfp_44.c
View file

@ -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);

3
lib/dns/rdata/generic/ta_32768.c
View file

@ -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);
}

3
lib/dns/rdata/generic/talink_58.c
View file

@ -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);

3
lib/dns/rdata/generic/tkey_249.c
View file

@ -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);

3
lib/dns/rdata/generic/tlsa_52.c
View file

@ -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);
}

3
lib/dns/rdata/generic/txt_16.c
View file

@ -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);
}

3
lib/dns/rdata/generic/uri_256.c
View file

@ -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);

3
lib/dns/rdata/generic/wallet_262.c
View file

@ -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);
}

3
lib/dns/rdata/generic/x25_19.c
View file

@ -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);

3
lib/dns/rdata/generic/zonemd_63.c
View file

@ -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);

3
lib/dns/rdata/hs_4/a_1.c
View file

@ -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);

3
lib/dns/rdata/in_1/a6_38.c
View file

@ -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);

3
lib/dns/rdata/in_1/a_1.c
View file

@ -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);

3
lib/dns/rdata/in_1/aaaa_28.c
View file

@ -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);

3
lib/dns/rdata/in_1/apl_42.c
View file

@ -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;

3
lib/dns/rdata/in_1/atma_34.c
View file

@ -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];

3
lib/dns/rdata/in_1/dhcid_49.c
View file

@ -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);

3
lib/dns/rdata/in_1/eid_31.c
View file

@ -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;

3
lib/dns/rdata/in_1/kx_36.c
View file

@ -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);

3
lib/dns/rdata/in_1/nimloc_32.c
View file

@ -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;

3
lib/dns/rdata/in_1/nsap-ptr_23.c
View file

@ -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);

3
lib/dns/rdata/in_1/nsap_22.c
View file

@ -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;

3
lib/dns/rdata/in_1/px_26.c
View file

@ -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);

3
lib/dns/rdata/in_1/srv_33.c
View file

@ -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);

3
lib/dns/rdata/in_1/svcb_64.c
View file

@ -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);

3
lib/dns/rdata/in_1/wks_11.c
View file

@ -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);