From 90f9d00f087ddb4442d1ebf628c1bcaff18226a0 Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Thu, 27 Apr 2000 23:57:56 +0000 Subject: [PATCH] declare arguments as UNUSED() when used in assertions only --- lib/dns/rdata/generic/cname_5.c | 12 +++++++----- lib/dns/rdata/generic/md_3.c | 3 ++- lib/dns/rdata/generic/mf_4.c | 3 ++- lib/dns/rdata/generic/soa_6.c | 3 ++- lib/dns/rdata/hs_4/a_1.c | 4 +++- lib/dns/rdata/in_1/a_1.c | 3 ++- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c index ad93e5229c..578c82226b 100644 --- a/lib/dns/rdata/generic/cname_5.c +++ b/lib/dns/rdata/generic/cname_5.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: cname_5.c,v 1.25 2000/04/27 00:02:24 tale Exp $ */ +/* $Id: cname_5.c,v 1.26 2000/04/27 23:57:55 gson Exp $ */ /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */ @@ -139,7 +139,6 @@ fromstruct_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, REQUIRE(type == 5); UNUSED(rdclass); - UNUSED(source); UNUSED(target); @@ -162,6 +161,8 @@ tostruct_cname(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) static inline void freestruct_cname(void *source) { + UNUSED(source); + REQUIRE(source != NULL); REQUIRE(ISC_FALSE); } @@ -170,11 +171,12 @@ static inline isc_result_t additionaldata_cname(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { + UNUSED(rdata); + UNUSED(add); + UNUSED(arg); + REQUIRE(rdata->type == 5); - (void)add; - (void)arg; - return (ISC_R_SUCCESS); } diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c index 00e70bd401..83b5a41470 100644 --- a/lib/dns/rdata/generic/md_3.c +++ b/lib/dns/rdata/generic/md_3.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: md_3.c,v 1.26 2000/04/27 00:02:28 tale Exp $ */ +/* $Id: md_3.c,v 1.27 2000/04/27 23:57:55 gson Exp $ */ /* Reviewed: Wed Mar 15 17:48:20 PST 2000 by bwelling */ @@ -144,6 +144,7 @@ fromstruct_md(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, static inline isc_result_t tostruct_md(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { + UNUSED(rdata); UNUSED(target); UNUSED(mctx); diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c index 55486b6c2d..9fc4a201e5 100644 --- a/lib/dns/rdata/generic/mf_4.c +++ b/lib/dns/rdata/generic/mf_4.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: mf_4.c,v 1.24 2000/04/27 00:02:29 tale Exp $ */ +/* $Id: mf_4.c,v 1.25 2000/04/27 23:57:55 gson Exp $ */ /* reviewed: Wed Mar 15 17:47:33 PST 2000 by brister */ @@ -152,6 +152,7 @@ tostruct_mf(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) REQUIRE(rdata->type == 4); + UNUSED(rdata); UNUSED(target); UNUSED(mctx); diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c index 621633f5b9..184134a85f 100644 --- a/lib/dns/rdata/generic/soa_6.c +++ b/lib/dns/rdata/generic/soa_6.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: soa_6.c,v 1.33 2000/04/27 00:02:39 tale Exp $ */ +/* $Id: soa_6.c,v 1.34 2000/04/27 23:57:56 gson Exp $ */ /* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */ @@ -334,6 +334,7 @@ static inline isc_result_t additionaldata_soa(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg) { + UNUSED(rdata); UNUSED(add); UNUSED(arg); diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c index acf51928b3..556d7eb416 100644 --- a/lib/dns/rdata/hs_4/a_1.c +++ b/lib/dns/rdata/hs_4/a_1.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: a_1.c,v 1.8 2000/04/27 00:02:45 tale Exp $ */ +/* $Id: a_1.c,v 1.9 2000/04/27 23:57:56 gson Exp $ */ /* reviewed: Thu Mar 16 15:58:36 PST 2000 by brister */ @@ -179,6 +179,8 @@ tostruct_hs_a(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) static inline void freestruct_hs_a(void *source) { + UNUSED(source); + REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c index 760f558f0c..e78fbe57d3 100644 --- a/lib/dns/rdata/in_1/a_1.c +++ b/lib/dns/rdata/in_1/a_1.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: a_1.c,v 1.28 2000/04/27 00:02:47 tale Exp $ */ +/* $Id: a_1.c,v 1.29 2000/04/27 23:57:56 gson Exp $ */ /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */ @@ -172,6 +172,7 @@ tostruct_in_a(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { static inline void freestruct_in_a(void *source) { + UNUSED(source); REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ }