Make calling generic rdata methods consistent

add matching macros to pass arguments from called methods
to generic methods.  This will reduce the amount of work
required when extending methods.

Also cleanup unnecessary UNUSED declarations.

(cherry picked from commit a88d3963e2b0620eb27b19a2024feb4251f4703a)

diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index bccacdee37c46ae258621b03b0a2d3291ab45f89..3bd7f54661a44a644826f94d976a6223b69d967b 100644 (file)
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -82,35 +82,61 @@
                        unsigned int options, isc_buffer_t *target, \
                        dns_rdatacallbacks_t *callbacks
 
-#define ARGS_TOTEXT    dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, \
-                       isc_buffer_t *target
+#define CALL_FROMTEXT rdclass, type, lexer, origin, options, target, callbacks
 
-#define ARGS_FROMWIRE  int rdclass, dns_rdatatype_t type, \
-                       isc_buffer_t *source, dns_decompress_t *dctx, \
-                       unsigned int options, isc_buffer_t *target
+#define ARGS_TOTEXT \
+       dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target
 
-#define ARGS_TOWIRE    dns_rdata_t *rdata, dns_compress_t *cctx, \
-                       isc_buffer_t *target
+#define CALL_TOTEXT rdata, tctx, target
 
-#define ARGS_COMPARE   const dns_rdata_t *rdata1, const dns_rdata_t *rdata2
+#define ARGS_FROMWIRE                                            \
+       int rdclass, dns_rdatatype_t type, isc_buffer_t *source, \
+               dns_decompress_t *dctx, unsigned int options,    \
+               isc_buffer_t *target
 
-#define ARGS_FROMSTRUCT        int rdclass, dns_rdatatype_t type, \
-                       void *source, isc_buffer_t *target
+#define CALL_FROMWIRE rdclass, type, source, dctx, options, target
 
-#define ARGS_TOSTRUCT  const dns_rdata_t *rdata, void *target, isc_mem_t *mctx
+#define ARGS_TOWIRE \
+       dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target
+
+#define CALL_TOWIRE rdata, cctx, target
+
+#define ARGS_COMPARE const dns_rdata_t *rdata1, const dns_rdata_t *rdata2
+
+#define CALL_COMPARE rdata1, rdata2
+
+#define ARGS_FROMSTRUCT \
+       int rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target
+
+#define CALL_FROMSTRUCT rdclass, type, source, target
+
+#define ARGS_TOSTRUCT const dns_rdata_t *rdata, void *target, isc_mem_t *mctx
+
+#define CALL_TOSTRUCT rdata, target, mctx
 
 #define ARGS_FREESTRUCT void *source
 
-#define ARGS_ADDLDATA  dns_rdata_t *rdata, dns_additionaldatafunc_t add, \
-                       void *arg
+#define CALL_FREESTRUCT source
+
+#define ARGS_ADDLDATA \
+       dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg
+
+#define CALL_ADDLDATA rdata, add, arg
+
+#define ARGS_DIGEST dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg
+
+#define CALL_DIGEST rdata, digest, arg
 
-#define ARGS_DIGEST    dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg
+#define ARGS_CHECKOWNER                                                  \
+       dns_name_t *name, dns_rdataclass_t rdclass, dns_rdatatype_t type, \
+       bool wildcard
 
-#define ARGS_CHECKOWNER dns_name_t *name, dns_rdataclass_t rdclass, \
-                       dns_rdatatype_t type, bool wildcard
+#define CALL_CHECKOWNER name, rdclass, type, wildcard
 
-#define ARGS_CHECKNAMES dns_rdata_t *rdata, dns_name_t *owner, dns_name_t *bad
+#define ARGS_CHECKNAMES \
+       dns_rdata_t *rdata, const dns_name_t *owner, dns_name_t *bad
 
+#define CALL_CHECKNAMES rdata, owner, bad
 
 /*%
  * Context structure for the totext_ functions.

diff --git a/lib/dns/rdata/generic/avc_258.c b/lib/dns/rdata/generic/avc_258.c
index d6a25da686d61ebb2e12e068bc487a5508dc4caf..1ea4ffc7a5a4fc3573ce5ff3e9e6a0474f263eb7 100644 (file)
--- a/lib/dns/rdata/generic/avc_258.c
+++ b/lib/dns/rdata/generic/avc_258.c
@@ -19,24 +19,15 @@ fromtext_avc(ARGS_FROMTEXT) {
 
        REQUIRE(type == dns_rdatatype_avc);
 
-       UNUSED(type);
-       UNUSED(rdclass);
-       UNUSED(origin);
-       UNUSED(options);
-       UNUSED(callbacks);
-
-       return (generic_fromtext_txt(rdclass, type, lexer, origin, options,
-                                    target, callbacks));
+       return (generic_fromtext_txt(CALL_FROMTEXT));
 }
 
 static inline isc_result_t
 totext_avc(ARGS_TOTEXT) {
-
-       UNUSED(tctx);
-
+       REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_avc);
 
-       return (generic_totext_txt(rdata, tctx, target));
+       return (generic_totext_txt(CALL_TOTEXT));
 }
 
 static inline isc_result_t
@@ -44,13 +35,7 @@ fromwire_avc(ARGS_FROMWIRE) {
 
        REQUIRE(type == dns_rdatatype_avc);
 
-       UNUSED(type);
-       UNUSED(dctx);
-       UNUSED(rdclass);
-       UNUSED(options);
-
-       return (generic_fromwire_txt(rdclass, type, source, dctx, options,
-                                    target));
+       return (generic_fromwire_txt(CALL_FROMWIRE));
 }
 
 static inline isc_result_t
@@ -82,7 +67,7 @@ fromstruct_avc(ARGS_FROMSTRUCT) {
 
        REQUIRE(type == dns_rdatatype_avc);
 
-       return (generic_fromstruct_txt(rdclass, type, source, target));
+       return (generic_fromstruct_txt(CALL_FROMSTRUCT));
 }
 
 static inline isc_result_t
@@ -98,7 +83,7 @@ tostruct_avc(ARGS_TOSTRUCT) {
        avc->common.rdtype = rdata->type;
        ISC_LINK_INIT(&avc->common, link);
 
-       return (generic_tostruct_txt(rdata, target, mctx));
+       return (generic_tostruct_txt(CALL_TOSTRUCT));
 }
 
 static inline void

diff --git a/lib/dns/rdata/generic/cdnskey_60.c b/lib/dns/rdata/generic/cdnskey_60.c
index 9579f4e935b6d88eb4bae7c548e5b35e8ff1e50b..5d2f54b33207e76b3439a161d3e9c7615ffbcae6 100644 (file)
--- a/lib/dns/rdata/generic/cdnskey_60.c
+++ b/lib/dns/rdata/generic/cdnskey_60.c
@@ -23,8 +23,7 @@ fromtext_cdnskey(ARGS_FROMTEXT) {
 
        REQUIRE(type == dns_rdatatype_cdnskey);
 
-       return (generic_fromtext_key(rdclass, type, lexer, origin,
-                                    options, target, callbacks));
+       return (generic_fromtext_key(CALL_FROMTEXT));
 }
 
 static inline isc_result_t
@@ -33,7 +32,7 @@ totext_cdnskey(ARGS_TOTEXT) {
        REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_cdnskey);
 
-       return (generic_totext_key(rdata, tctx, target));
+       return (generic_totext_key(CALL_TOTEXT));
 }
 
 static inline isc_result_t
@@ -41,8 +40,7 @@ fromwire_cdnskey(ARGS_FROMWIRE) {
 
        REQUIRE(type == dns_rdatatype_cdnskey);
 
-       return (generic_fromwire_key(rdclass, type, source, dctx,
-                                    options, target));
+       return (generic_fromwire_key(CALL_FROMWIRE));
 }
 
 static inline isc_result_t
@@ -81,7 +79,7 @@ fromstruct_cdnskey(ARGS_FROMSTRUCT) {
 
        REQUIRE(type == dns_rdatatype_cdnskey);
 
-       return (generic_fromstruct_key(rdclass, type, source, target));
+       return (generic_fromstruct_key(CALL_FROMSTRUCT));
 }
 
 static inline isc_result_t
@@ -98,7 +96,7 @@ tostruct_cdnskey(ARGS_TOSTRUCT) {
        dnskey->common.rdtype = rdata->type;
        ISC_LINK_INIT(&dnskey->common, link);
 
-       return (generic_tostruct_key(rdata, target, mctx));
+       return (generic_tostruct_key(CALL_TOSTRUCT));
 }
 
 static inline void

diff --git a/lib/dns/rdata/generic/cds_59.c b/lib/dns/rdata/generic/cds_59.c
index 968dabfc3787e1b7b2532b4180f6492d7951c764..582a255be6ecc9dac60b85957cd8ed7f3234956e 100644 (file)
--- a/lib/dns/rdata/generic/cds_59.c
+++ b/lib/dns/rdata/generic/cds_59.c
@@ -28,16 +28,15 @@ fromtext_cds(ARGS_FROMTEXT) {
 
        REQUIRE(type == dns_rdatatype_cds);
 
-       return (generic_fromtext_ds(rdclass, type, lexer, origin, options,
-                                   target, callbacks));
+       return (generic_fromtext_ds(CALL_FROMTEXT));
 }
 
 static inline isc_result_t
 totext_cds(ARGS_TOTEXT) {
-
+       REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_cds);
 
-       return (generic_totext_ds(rdata, tctx, target));
+       return (generic_totext_ds(CALL_TOTEXT));
 }
 
 static inline isc_result_t
@@ -45,8 +44,7 @@ fromwire_cds(ARGS_FROMWIRE) {
 
        REQUIRE(type == dns_rdatatype_cds);
 
-       return (generic_fromwire_ds(rdclass, type, source, dctx, options,
-                                   target));
+       return (generic_fromwire_ds(CALL_FROMWIRE));
 }
 
 static inline isc_result_t
@@ -83,7 +81,7 @@ fromstruct_cds(ARGS_FROMSTRUCT) {
 
        REQUIRE(type == dns_rdatatype_cds);
 
-       return (generic_fromstruct_ds(rdclass, type, source, target));
+       return (generic_fromstruct_ds(CALL_FROMSTRUCT));
 }
 
 static inline isc_result_t
@@ -103,7 +101,7 @@ tostruct_cds(ARGS_TOSTRUCT) {
        cds->common.rdtype = rdata->type;
        ISC_LINK_INIT(&cds->common, link);
 
-       return (generic_tostruct_ds(rdata, target, mctx));
+       return (generic_tostruct_ds(CALL_TOSTRUCT));
 }
 
 static inline void

diff --git a/lib/dns/rdata/generic/dlv_32769.c b/lib/dns/rdata/generic/dlv_32769.c
index ce96f1b971f4b1938d372dbc3ac908d3f7134dad..3e5c8ba9657700ce52a03654f4edd27f618b12e2 100644 (file)
--- a/lib/dns/rdata/generic/dlv_32769.c
+++ b/lib/dns/rdata/generic/dlv_32769.c
@@ -29,16 +29,15 @@ fromtext_dlv(ARGS_FROMTEXT) {
 
        REQUIRE(type == dns_rdatatype_dlv);
 
-       return (generic_fromtext_ds(rdclass, type, lexer, origin, options,
-                                   target, callbacks));
+       return (generic_fromtext_ds(CALL_FROMTEXT));
 }
 
 static inline isc_result_t
 totext_dlv(ARGS_TOTEXT) {
-
+       REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_dlv);
 
-       return (generic_totext_ds(rdata, tctx, target));
+       return (generic_totext_ds(CALL_TOTEXT));
 }
 
 static inline isc_result_t
@@ -46,8 +45,7 @@ fromwire_dlv(ARGS_FROMWIRE) {
 
        REQUIRE(type == dns_rdatatype_dlv);
 
-       return (generic_fromwire_ds(rdclass, type, source, dctx, options,
-                                   target));
+       return (generic_fromwire_ds(CALL_FROMWIRE));
 }
 
 static inline isc_result_t
@@ -84,7 +82,7 @@ fromstruct_dlv(ARGS_FROMSTRUCT) {
 
        REQUIRE(type == dns_rdatatype_dlv);
 
-       return (generic_fromstruct_ds(rdclass, type, source, target));
+       return (generic_fromstruct_ds(CALL_FROMSTRUCT));
 }
 
 static inline isc_result_t
@@ -100,7 +98,7 @@ tostruct_dlv(ARGS_TOSTRUCT) {
        dlv->common.rdtype = rdata->type;
        ISC_LINK_INIT(&dlv->common, link);
 
-       return (generic_tostruct_ds(rdata, target, mctx));
+       return (generic_tostruct_ds(CALL_TOSTRUCT));
 }
 
 static inline void

diff --git a/lib/dns/rdata/generic/dnskey_48.c b/lib/dns/rdata/generic/dnskey_48.c
index ef53ba8f5f2f6d1dcc43ea8d32094c796feeee56..3ba3e1ec93ccc3cb558a6449e7e83c96475993e1 100644 (file)
--- a/lib/dns/rdata/generic/dnskey_48.c
+++ b/lib/dns/rdata/generic/dnskey_48.c
@@ -23,8 +23,7 @@ fromtext_dnskey(ARGS_FROMTEXT) {
 
        REQUIRE(type == dns_rdatatype_dnskey);
 
-       return (generic_fromtext_key(rdclass, type, lexer, origin,
-                                    options, target, callbacks));
+       return (generic_fromtext_key(CALL_FROMTEXT));
 }
 
 static inline isc_result_t
@@ -33,7 +32,7 @@ totext_dnskey(ARGS_TOTEXT) {
        REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_dnskey);
 
-       return (generic_totext_key(rdata, tctx, target));
+       return (generic_totext_key(CALL_TOTEXT));
 }
 
 static inline isc_result_t
@@ -41,8 +40,7 @@ fromwire_dnskey(ARGS_FROMWIRE) {
 
        REQUIRE(type == dns_rdatatype_dnskey);
 
-       return (generic_fromwire_key(rdclass, type, source, dctx,
-                                    options, target));
+       return (generic_fromwire_key(CALL_FROMWIRE));
 }
 
 static inline isc_result_t
@@ -82,7 +80,7 @@ fromstruct_dnskey(ARGS_FROMSTRUCT) {
 
        REQUIRE(type == dns_rdatatype_dnskey);
 
-       return (generic_fromstruct_key(rdclass, type, source, target));
+       return (generic_fromstruct_key(CALL_FROMSTRUCT));
 }
 
 static inline isc_result_t
@@ -99,7 +97,7 @@ tostruct_dnskey(ARGS_TOSTRUCT) {
        dnskey->common.rdtype = rdata->type;
        ISC_LINK_INIT(&dnskey->common, link);
 
-       return (generic_tostruct_key(rdata, target, mctx));
+       return (generic_tostruct_key(CALL_TOSTRUCT));
 }
 
 static inline void

diff --git a/lib/dns/rdata/generic/ds_43.c b/lib/dns/rdata/generic/ds_43.c
index 6651f77f8d54e857fdf4fba0e663aa8a5f0c997c..abed138d05251d4aa58895ac5727d07f380c80aa 100644 (file)
--- a/lib/dns/rdata/generic/ds_43.c
+++ b/lib/dns/rdata/generic/ds_43.c
@@ -93,8 +93,7 @@ fromtext_ds(ARGS_FROMTEXT) {
 
        REQUIRE(type == dns_rdatatype_ds);
 
-       return (generic_fromtext_ds(rdclass, type, lexer, origin, options,
-                                   target, callbacks));
+       return (generic_fromtext_ds(CALL_FROMTEXT));
 }
 
 static inline isc_result_t
@@ -154,10 +153,10 @@ generic_totext_ds(ARGS_TOTEXT) {
 
 static inline isc_result_t
 totext_ds(ARGS_TOTEXT) {
-
+       REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_ds);
 
-       return (generic_totext_ds(rdata, tctx, target));
+       return (generic_totext_ds(CALL_TOTEXT));
 }
 
 static inline isc_result_t
@@ -212,8 +211,7 @@ fromwire_ds(ARGS_FROMWIRE) {
 
        REQUIRE(type == dns_rdatatype_ds);
 
-       return (generic_fromwire_ds(rdclass, type, source, dctx, options,
-                                   target));
+       return (generic_fromwire_ds(CALL_FROMWIRE));
 }
 
 static inline isc_result_t
@@ -287,7 +285,7 @@ fromstruct_ds(ARGS_FROMSTRUCT) {
 
        REQUIRE(type == dns_rdatatype_ds);
 
-       return (generic_fromstruct_ds(rdclass, type, source, target));
+       return (generic_fromstruct_ds(CALL_FROMSTRUCT));
 }
 
 static inline isc_result_t
@@ -334,7 +332,7 @@ tostruct_ds(ARGS_TOSTRUCT) {
        ds->common.rdtype = rdata->type;
        ISC_LINK_INIT(&ds->common, link);
 
-       return (generic_tostruct_ds(rdata, target, mctx));
+       return (generic_tostruct_ds(CALL_TOSTRUCT));
 }
 
 static inline void

diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index 51f928b17196bd5edf801e447963da31f700b7dd..86000a15fdd29027f45d72635a96a2dc591e18d8 100644 (file)
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -250,8 +250,7 @@ fromtext_key(ARGS_FROMTEXT) {
 
        REQUIRE(type == dns_rdatatype_key);
 
-       return (generic_fromtext_key(rdclass, type, lexer, origin,
-                                    options, target, callbacks));
+       return (generic_fromtext_key(CALL_FROMTEXT));
 }
 
 static inline isc_result_t
@@ -260,7 +259,7 @@ totext_key(ARGS_TOTEXT) {
        REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_key);
 
-       return (generic_totext_key(rdata, tctx, target));
+       return (generic_totext_key(CALL_TOTEXT));
 }
 
 static inline isc_result_t
@@ -268,8 +267,7 @@ fromwire_key(ARGS_FROMWIRE) {
 
        REQUIRE(type == dns_rdatatype_key);
 
-       return (generic_fromwire_key(rdclass, type, source, dctx,
-                                    options, target));
+       return (generic_fromwire_key(CALL_FROMWIRE));
 }
 
 static inline isc_result_t
@@ -398,7 +396,7 @@ fromstruct_key(ARGS_FROMSTRUCT) {
 
        REQUIRE(type == dns_rdatatype_key);
 
-       return (generic_fromstruct_key(rdclass, type, source, target));
+       return (generic_fromstruct_key(CALL_FROMSTRUCT));
 }
 
 static inline isc_result_t
@@ -415,7 +413,7 @@ tostruct_key(ARGS_TOSTRUCT) {
        key->common.rdtype = rdata->type;
        ISC_LINK_INIT(&key->common, link);
 
-       return (generic_tostruct_key(rdata, target, mctx));
+       return (generic_tostruct_key(CALL_TOSTRUCT));
 }
 
 static inline void

diff --git a/lib/dns/rdata/generic/ninfo_56.c b/lib/dns/rdata/generic/ninfo_56.c
index 700987d2ee23b9aa82f2f31eef8b455825e0dffa..d9b07009e5829a32328c57925ada02f5f83a644d 100644 (file)
--- a/lib/dns/rdata/generic/ninfo_56.c
+++ b/lib/dns/rdata/generic/ninfo_56.c
@@ -19,24 +19,15 @@ fromtext_ninfo(ARGS_FROMTEXT) {
 
        REQUIRE(type == dns_rdatatype_ninfo);
 
-       UNUSED(type);
-       UNUSED(rdclass);
-       UNUSED(origin);
-       UNUSED(options);
-       UNUSED(callbacks);
-
-       return (generic_fromtext_txt(rdclass, type, lexer, origin, options,
-                                    target, callbacks));
+       return (generic_fromtext_txt(CALL_FROMTEXT));
 }
 
 static inline isc_result_t
 totext_ninfo(ARGS_TOTEXT) {
-
-       UNUSED(tctx);
-
+       REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_ninfo);
 
-       return (generic_totext_txt(rdata, tctx, target));
+       return (generic_totext_txt(CALL_TOTEXT));
 }
 
 static inline isc_result_t
@@ -44,13 +35,7 @@ fromwire_ninfo(ARGS_FROMWIRE) {
 
        REQUIRE(type == dns_rdatatype_ninfo);
 
-       UNUSED(type);
-       UNUSED(dctx);
-       UNUSED(rdclass);
-       UNUSED(options);
-
-       return (generic_fromwire_txt(rdclass, type, source, dctx, options,
-                                    target));
+       return (generic_fromwire_txt(CALL_FROMWIRE));
 }
 
 static inline isc_result_t
@@ -82,7 +67,7 @@ fromstruct_ninfo(ARGS_FROMSTRUCT) {
 
        REQUIRE(type == dns_rdatatype_ninfo);
 
-       return (generic_fromstruct_txt(rdclass, type, source, target));
+       return (generic_fromstruct_txt(CALL_FROMSTRUCT));
 }
 
 static inline isc_result_t
@@ -98,7 +83,7 @@ tostruct_ninfo(ARGS_TOSTRUCT) {
        ninfo->common.rdtype = rdata->type;
        ISC_LINK_INIT(&ninfo->common, link);
 
-       return (generic_tostruct_txt(rdata, target, mctx));
+       return (generic_tostruct_txt(CALL_TOSTRUCT));
 }
 
 static inline void

diff --git a/lib/dns/rdata/generic/rkey_57.c b/lib/dns/rdata/generic/rkey_57.c
index 07834c36f09c998d645a2c8762b1ce628d5fc081..db31b4705619a64227d26077b78ab01b9ac05368 100644 (file)
--- a/lib/dns/rdata/generic/rkey_57.c
+++ b/lib/dns/rdata/generic/rkey_57.c
@@ -19,8 +19,7 @@ fromtext_rkey(ARGS_FROMTEXT) {
 
        REQUIRE(type == dns_rdatatype_rkey);
 
-       return (generic_fromtext_key(rdclass, type, lexer, origin,
-                                    options, target, callbacks));
+       return (generic_fromtext_key(CALL_FROMTEXT));
 }
 
 static inline isc_result_t
@@ -29,7 +28,7 @@ totext_rkey(ARGS_TOTEXT) {
        REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_rkey);
 
-       return (generic_totext_key(rdata, tctx, target));
+       return (generic_totext_key(CALL_TOTEXT));
 }
 
 static inline isc_result_t
@@ -37,8 +36,7 @@ fromwire_rkey(ARGS_FROMWIRE) {
 
        REQUIRE(type == dns_rdatatype_rkey);
 
-       return (generic_fromwire_key(rdclass, type, source, dctx,
-                                    options, target));
+       return (generic_fromwire_key(CALL_FROMWIRE));
 }
 
 static inline isc_result_t
@@ -78,7 +76,7 @@ fromstruct_rkey(ARGS_FROMSTRUCT) {
 
        REQUIRE(type == dns_rdatatype_rkey);
 
-       return (generic_fromstruct_key(rdclass, type, source, target));
+       return (generic_fromstruct_key(CALL_FROMSTRUCT));
 }
 
 static inline isc_result_t
@@ -95,7 +93,7 @@ tostruct_rkey(ARGS_TOSTRUCT) {
        rkey->common.rdtype = rdata->type;
        ISC_LINK_INIT(&rkey->common, link);
 
-       return (generic_tostruct_key(rdata, target, mctx));
+       return (generic_tostruct_key(CALL_TOSTRUCT));
 }
 
 static inline void

diff --git a/lib/dns/rdata/generic/smimea_53.c b/lib/dns/rdata/generic/smimea_53.c
index df70b2b6010af523a922d4b7739a87b438548bdf..239f92e1982c1b22f2d576bdf6b6c916c2adeed6 100644 (file)
--- a/lib/dns/rdata/generic/smimea_53.c
+++ b/lib/dns/rdata/generic/smimea_53.c
@@ -19,16 +19,15 @@ fromtext_smimea(ARGS_FROMTEXT) {
 
        REQUIRE(type == dns_rdatatype_smimea);
 
-       return (generic_fromtext_tlsa(rdclass, type, lexer, origin, options,
-                                     target, callbacks));
+       return (generic_fromtext_tlsa(CALL_FROMTEXT));
 }
 
 static inline isc_result_t
 totext_smimea(ARGS_TOTEXT) {
-
+       REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_smimea);
 
-       return (generic_totext_tlsa(rdata, tctx, target));
+       return (generic_totext_tlsa(CALL_TOTEXT));
 }
 
 static inline isc_result_t
@@ -36,8 +35,7 @@ fromwire_smimea(ARGS_FROMWIRE) {
 
        REQUIRE(type == dns_rdatatype_smimea);
 
-       return (generic_fromwire_tlsa(rdclass, type, source, dctx, options,
-                                     target));
+       return (generic_fromwire_tlsa(CALL_FROMWIRE));
 }
 
 static inline isc_result_t
@@ -74,7 +72,7 @@ fromstruct_smimea(ARGS_FROMSTRUCT) {
 
        REQUIRE(type == dns_rdatatype_smimea);
 
-       return (generic_fromstruct_tlsa(rdclass, type, source, target));
+       return (generic_fromstruct_tlsa(CALL_FROMSTRUCT));
 }
 
 static inline isc_result_t
@@ -91,7 +89,7 @@ tostruct_smimea(ARGS_TOSTRUCT) {
        smimea->common.rdtype = rdata->type;
        ISC_LINK_INIT(&smimea->common, link);
 
-       return (generic_tostruct_tlsa(rdata, target, mctx));
+       return (generic_tostruct_tlsa(CALL_TOSTRUCT));
 }
 
 static inline void

diff --git a/lib/dns/rdata/generic/spf_99.c b/lib/dns/rdata/generic/spf_99.c
index 579619c5b8480974ae8669805883b3922e236bc7..eeb464e3ab61958d960eb727532adf95e06d3c1b 100644 (file)
--- a/lib/dns/rdata/generic/spf_99.c
+++ b/lib/dns/rdata/generic/spf_99.c
@@ -19,24 +19,15 @@ fromtext_spf(ARGS_FROMTEXT) {
 
        REQUIRE(type == dns_rdatatype_spf);
 
-       UNUSED(type);
-       UNUSED(rdclass);
-       UNUSED(origin);
-       UNUSED(options);
-       UNUSED(callbacks);
-
-       return (generic_fromtext_txt(rdclass, type, lexer, origin, options,
-                                    target, callbacks));
+       return (generic_fromtext_txt(CALL_FROMTEXT));
 }
 
 static inline isc_result_t
 totext_spf(ARGS_TOTEXT) {
-
-       UNUSED(tctx);
-
+       REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_spf);
 
-       return (generic_totext_txt(rdata, tctx, target));
+       return (generic_totext_txt(CALL_TOTEXT));
 }
 
 static inline isc_result_t
@@ -44,13 +35,7 @@ fromwire_spf(ARGS_FROMWIRE) {
 
        REQUIRE(type == dns_rdatatype_spf);
 
-       UNUSED(type);
-       UNUSED(dctx);
-       UNUSED(rdclass);
-       UNUSED(options);
-
-       return (generic_fromwire_txt(rdclass, type, source, dctx, options,
-                                    target));
+       return (generic_fromwire_txt(CALL_FROMWIRE));
 }
 
 static inline isc_result_t
@@ -82,7 +67,7 @@ fromstruct_spf(ARGS_FROMSTRUCT) {
 
        REQUIRE(type == dns_rdatatype_spf);
 
-       return (generic_fromstruct_txt(rdclass, type, source, target));
+       return (generic_fromstruct_txt(CALL_FROMSTRUCT));
 }
 
 static inline isc_result_t
@@ -99,7 +84,7 @@ tostruct_spf(ARGS_TOSTRUCT) {
        spf->common.rdtype = rdata->type;
        ISC_LINK_INIT(&spf->common, link);
 
-       return (generic_tostruct_txt(rdata, target, mctx));
+       return (generic_tostruct_txt(CALL_TOSTRUCT));
 }
 
 static inline void

diff --git a/lib/dns/rdata/generic/ta_32768.c b/lib/dns/rdata/generic/ta_32768.c
index fdcc956bdba5a03f13cf150ea312f412beedb85b..729331e153aa8ca5886291c72c27a4b6e8432ac6 100644 (file)
--- a/lib/dns/rdata/generic/ta_32768.c
+++ b/lib/dns/rdata/generic/ta_32768.c
@@ -21,8 +21,7 @@ fromtext_ta(ARGS_FROMTEXT) {
 
        REQUIRE(type == dns_rdatatype_ta);
 
-       return (generic_fromtext_ds(rdclass, type, lexer, origin, options,
-                                   target, callbacks));
+       return (generic_fromtext_ds(CALL_FROMTEXT));
 }
 
 static inline isc_result_t
@@ -30,7 +29,7 @@ totext_ta(ARGS_TOTEXT) {
 
        REQUIRE(rdata->type == dns_rdatatype_ta);
 
-       return (generic_totext_ds(rdata, tctx, target));
+       return (generic_totext_ds(CALL_TOTEXT));
 }
 
 static inline isc_result_t
@@ -38,8 +37,7 @@ fromwire_ta(ARGS_FROMWIRE) {
 
        REQUIRE(type == dns_rdatatype_ta);
 
-       return (generic_fromwire_ds(rdclass, type, source, dctx, options,
-                                   target));
+       return (generic_fromwire_ds(CALL_FROMWIRE));
 }
 
 static inline isc_result_t
@@ -76,7 +74,7 @@ fromstruct_ta(ARGS_FROMSTRUCT) {
 
        REQUIRE(type == dns_rdatatype_ta);
 
-       return (generic_fromstruct_ds(rdclass, type, source, target));
+       return (generic_fromstruct_ds(CALL_FROMSTRUCT));
 }
 
 static inline isc_result_t
@@ -95,7 +93,7 @@ tostruct_ta(ARGS_TOSTRUCT) {
        ds->common.rdtype = rdata->type;
        ISC_LINK_INIT(&ds->common, link);
 
-       return (generic_tostruct_ds(rdata, target, mctx));
+       return (generic_tostruct_ds(CALL_TOSTRUCT));
 }
 
 static inline void

diff --git a/lib/dns/rdata/generic/tlsa_52.c b/lib/dns/rdata/generic/tlsa_52.c
index 581fb929e8e5950ceca3faeed14045928f62cace..065e40fe325a1dd164680d70c99e83a241513fea 100644 (file)
--- a/lib/dns/rdata/generic/tlsa_52.c
+++ b/lib/dns/rdata/generic/tlsa_52.c
@@ -136,8 +136,7 @@ fromtext_tlsa(ARGS_FROMTEXT) {
 
        REQUIRE(type == dns_rdatatype_tlsa);
 
-       return (generic_fromtext_tlsa(rdclass, type, lexer, origin, options,
-                                     target, callbacks));
+       return (generic_fromtext_tlsa(CALL_FROMTEXT));
 }
 
 static inline isc_result_t
@@ -145,7 +144,7 @@ totext_tlsa(ARGS_TOTEXT) {
 
        REQUIRE(rdata->type == dns_rdatatype_tlsa);
 
-       return (generic_totext_tlsa(rdata, tctx, target));
+       return (generic_totext_tlsa(CALL_TOTEXT));
 }
 
 static inline isc_result_t
@@ -153,8 +152,7 @@ fromwire_tlsa(ARGS_FROMWIRE) {
 
        REQUIRE(type == dns_rdatatype_tlsa);
 
-       return (generic_fromwire_tlsa(rdclass, type, source, dctx, options,
-                                     target));
+       return (generic_fromwire_tlsa(CALL_FROMWIRE));
 }
 
 static inline isc_result_t
@@ -258,7 +256,7 @@ fromstruct_tlsa(ARGS_FROMSTRUCT) {
 
        REQUIRE(type == dns_rdatatype_tlsa);
 
-       return (generic_fromstruct_tlsa(rdclass, type, source, target));
+       return (generic_fromstruct_tlsa(CALL_FROMSTRUCT));
 }
 
 static inline isc_result_t
@@ -274,7 +272,7 @@ tostruct_tlsa(ARGS_TOSTRUCT) {
        tlsa->common.rdtype = rdata->type;
        ISC_LINK_INIT(&tlsa->common, link);
 
-       return (generic_tostruct_tlsa(rdata, target, mctx));
+       return (generic_tostruct_tlsa(CALL_TOSTRUCT));
 }
 
 static inline void

diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c
index b1427d12d4c86a9cdb4a93c0bdb982a79cfe440f..3500552df75f5a50a009847850a593938d59e9fb 100644 (file)
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -87,16 +87,15 @@ fromtext_txt(ARGS_FROMTEXT) {
 
        REQUIRE(type == dns_rdatatype_txt);
 
-       return (generic_fromtext_txt(rdclass, type, lexer, origin, options,
-                                    target, callbacks));
+       return (generic_fromtext_txt(CALL_FROMTEXT));
 }
 
 static inline isc_result_t
 totext_txt(ARGS_TOTEXT) {
-
+       REQUIRE(rdata != NULL);
        REQUIRE(rdata->type == dns_rdatatype_txt);
 
-       return (generic_totext_txt(rdata, tctx, target));
+       return (generic_totext_txt(CALL_TOTEXT));
 }
 
 static inline isc_result_t
@@ -104,8 +103,7 @@ fromwire_txt(ARGS_FROMWIRE) {
 
        REQUIRE(type == dns_rdatatype_txt);
 
-       return (generic_fromwire_txt(rdclass, type, source, dctx, options,
-                                    target));
+       return (generic_fromwire_txt(CALL_FROMWIRE));
 }
 
 static inline isc_result_t
@@ -206,7 +204,7 @@ fromstruct_txt(ARGS_FROMSTRUCT) {
 
        REQUIRE(type == dns_rdatatype_txt);
 
-       return (generic_fromstruct_txt(rdclass, type, source, target));
+       return (generic_fromstruct_txt(CALL_FROMSTRUCT));
 }
 
 static inline isc_result_t
@@ -222,7 +220,7 @@ tostruct_txt(ARGS_TOSTRUCT) {
        txt->common.rdtype = rdata->type;
        ISC_LINK_INIT(&txt->common, link);
 
-       return (generic_tostruct_txt(rdata, target, mctx));
+       return (generic_tostruct_txt(CALL_TOSTRUCT));
 }
 
 static inline void