Commit ae114ded authored by Brian Wellington's avatar Brian Wellington
Browse files

Fix a bunch of unused variable warnings that only occurred with assertions

turned off.
parent 36c754f2
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: tsig_250.c,v 1.49 2001/03/06 22:10:35 marka Exp $ */
/* $Id: tsig_250.c,v 1.50 2001/03/16 22:52:32 bwelling Exp $ */
/* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */
......@@ -38,6 +38,7 @@ fromtext_any_tsig(ARGS_FROMTEXT) {
REQUIRE(type == 250);
REQUIRE(rdclass == 255);
UNUSED(type);
UNUSED(rdclass);
/*
......@@ -249,6 +250,7 @@ fromwire_any_tsig(ARGS_FROMWIRE) {
REQUIRE(type == 250);
REQUIRE(rdclass == 255);
UNUSED(type);
UNUSED(rdclass);
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
......@@ -361,6 +363,7 @@ fromstruct_any_tsig(ARGS_FROMSTRUCT) {
REQUIRE(tsig->common.rdclass == rdclass);
REQUIRE(tsig->common.rdtype == type);
UNUSED(type);
UNUSED(rdclass);
/*
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: afsdb_18.c,v 1.37 2001/03/06 22:10:37 marka Exp $ */
/* $Id: afsdb_18.c,v 1.38 2001/03/16 22:52:33 bwelling Exp $ */
/* Reviewed: Wed Mar 15 14:59:00 PST 2000 by explorer */
......@@ -32,10 +32,11 @@ fromtext_afsdb(ARGS_FROMTEXT) {
isc_buffer_t buffer;
dns_name_t name;
UNUSED(rdclass);
REQUIRE(type == 18);
UNUSED(type);
UNUSED(rdclass);
/*
* Subtype.
*/
......@@ -88,10 +89,11 @@ fromwire_afsdb(ARGS_FROMWIRE) {
isc_region_t sr;
isc_region_t tr;
UNUSED(rdclass);
REQUIRE(type == 18);
UNUSED(type);
UNUSED(rdclass);
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
dns_name_init(&name, NULL);
......@@ -176,6 +178,7 @@ fromstruct_afsdb(ARGS_FROMSTRUCT) {
REQUIRE(afsdb->common.rdclass == rdclass);
REQUIRE(afsdb->common.rdtype == type);
UNUSED(type);
UNUSED(rdclass);
RETERR(uint16_tobuffer(afsdb->subtype, target));
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: cert_37.c,v 1.37 2001/03/06 22:10:38 marka Exp $ */
/* $Id: cert_37.c,v 1.38 2001/03/16 22:52:35 bwelling Exp $ */
/* Reviewed: Wed Mar 15 21:14:32 EST 2000 by tale */
......@@ -34,6 +34,7 @@ fromtext_cert(ARGS_FROMTEXT) {
REQUIRE(type == 37);
UNUSED(type);
UNUSED(rdclass);
UNUSED(origin);
UNUSED(downcase);
......@@ -120,6 +121,7 @@ fromwire_cert(ARGS_FROMWIRE) {
REQUIRE(type == 37);
UNUSED(type);
UNUSED(rdclass);
UNUSED(dctx);
UNUSED(downcase);
......@@ -170,6 +172,7 @@ fromstruct_cert(ARGS_FROMSTRUCT) {
REQUIRE(cert->common.rdtype == type);
REQUIRE(cert->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
RETERR(uint16_tobuffer(cert->type, target));
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: cname_5.c,v 1.41 2001/03/06 22:10:39 marka Exp $ */
/* $Id: cname_5.c,v 1.42 2001/03/16 22:52:36 bwelling Exp $ */
/* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
......@@ -33,6 +33,7 @@ fromtext_cname(ARGS_FROMTEXT) {
REQUIRE(type == 5);
UNUSED(type);
UNUSED(rdclass);
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
......@@ -72,6 +73,7 @@ fromwire_cname(ARGS_FROMWIRE) {
REQUIRE(type == 5);
UNUSED(type);
UNUSED(rdclass);
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
......@@ -133,6 +135,7 @@ fromstruct_cname(ARGS_FROMSTRUCT) {
REQUIRE(cname->common.rdtype == type);
REQUIRE(cname->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
dns_name_toregion(&cname->cname, &region);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dname_39.c,v 1.31 2001/03/06 22:10:40 marka Exp $ */
/* $Id: dname_39.c,v 1.32 2001/03/16 22:52:37 bwelling Exp $ */
/* Reviewed: Wed Mar 15 16:52:38 PST 2000 by explorer */
......@@ -32,10 +32,11 @@ fromtext_dname(ARGS_FROMTEXT) {
dns_name_t name;
isc_buffer_t buffer;
UNUSED(rdclass);
REQUIRE(type == 39);
UNUSED(type);
UNUSED(rdclass);
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
ISC_FALSE));
......@@ -71,10 +72,11 @@ static inline isc_result_t
fromwire_dname(ARGS_FROMWIRE) {
dns_name_t name;
UNUSED(rdclass);
REQUIRE(type == 39);
UNUSED(type);
UNUSED(rdclass);
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
dns_name_init(&name, NULL);
......@@ -133,6 +135,7 @@ fromstruct_dname(ARGS_FROMSTRUCT) {
REQUIRE(dname->common.rdtype == type);
REQUIRE(dname->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
dns_name_toregion(&dname->dname, &region);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: gpos_27.c,v 1.29 2001/03/06 22:10:41 marka Exp $ */
/* $Id: gpos_27.c,v 1.30 2001/03/16 22:52:38 bwelling Exp $ */
/* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
......@@ -33,6 +33,7 @@ fromtext_gpos(ARGS_FROMTEXT) {
REQUIRE(type == 27);
UNUSED(type);
UNUSED(rdclass);
UNUSED(origin);
UNUSED(downcase);
......@@ -73,6 +74,7 @@ fromwire_gpos(ARGS_FROMWIRE) {
REQUIRE(type == 27);
UNUSED(type);
UNUSED(dctx);
UNUSED(rdclass);
UNUSED(downcase);
......@@ -118,6 +120,7 @@ fromstruct_gpos(ARGS_FROMSTRUCT) {
REQUIRE(gpos->common.rdtype == type);
REQUIRE(gpos->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
RETERR(uint8_tobuffer(gpos->long_len, target));
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: hinfo_13.c,v 1.34 2001/03/06 22:10:42 marka Exp $ */
/* $Id: hinfo_13.c,v 1.35 2001/03/16 22:52:39 bwelling Exp $ */
/*
* Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
......@@ -31,6 +31,7 @@ fromtext_hinfo(ARGS_FROMTEXT) {
isc_token_t token;
int i;
UNUSED(type);
UNUSED(rdclass);
UNUSED(origin);
UNUSED(downcase);
......@@ -64,12 +65,13 @@ totext_hinfo(ARGS_TOTEXT) {
static inline isc_result_t
fromwire_hinfo(ARGS_FROMWIRE) {
REQUIRE(type == 13);
UNUSED(type);
UNUSED(dctx);
UNUSED(rdclass);
UNUSED(downcase);
REQUIRE(type == 13);
RETERR(txt_fromwire(source, target));
return (txt_fromwire(source, target));
}
......@@ -110,6 +112,7 @@ fromstruct_hinfo(ARGS_FROMSTRUCT) {
REQUIRE(hinfo->common.rdtype == type);
REQUIRE(hinfo->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
RETERR(uint8_tobuffer(hinfo->cpu_len, target));
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: isdn_20.c,v 1.27 2001/03/06 22:10:43 marka Exp $ */
/* $Id: isdn_20.c,v 1.28 2001/03/16 22:52:41 bwelling Exp $ */
/* Reviewed: Wed Mar 15 16:53:11 PST 2000 by bwelling */
......@@ -30,12 +30,13 @@ static inline isc_result_t
fromtext_isdn(ARGS_FROMTEXT) {
isc_token_t token;
REQUIRE(type == 20);
UNUSED(type);
UNUSED(rdclass);
UNUSED(origin);
UNUSED(downcase);
REQUIRE(type == 20);
/* ISDN-address */
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_qstring,
ISC_FALSE));
......@@ -57,11 +58,11 @@ static inline isc_result_t
totext_isdn(ARGS_TOTEXT) {
isc_region_t region;
UNUSED(tctx);
REQUIRE(rdata->type == 20);
REQUIRE(rdata->length != 0);
UNUSED(tctx);
dns_rdata_toregion(rdata, &region);
RETERR(txt_totext(&region, target));
if (region.length == 0)
......@@ -72,12 +73,13 @@ totext_isdn(ARGS_TOTEXT) {
static inline isc_result_t
fromwire_isdn(ARGS_FROMWIRE) {
REQUIRE(type == 20);
UNUSED(type);
UNUSED(dctx);
UNUSED(rdclass);
UNUSED(downcase);
REQUIRE(type == 20);
RETERR(txt_fromwire(source, target));
if (buffer_empty(source))
return (ISC_R_SUCCESS);
......@@ -119,6 +121,7 @@ fromstruct_isdn(ARGS_FROMSTRUCT) {
REQUIRE(isdn->common.rdtype == type);
REQUIRE(isdn->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
RETERR(uint8_tobuffer(isdn->isdn_len, target));
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: key_25.c,v 1.37 2001/03/06 22:10:44 marka Exp $ */
/* $Id: key_25.c,v 1.38 2001/03/16 22:52:42 bwelling Exp $ */
/*
* Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
......@@ -39,6 +39,7 @@ fromtext_key(ARGS_FROMTEXT) {
REQUIRE(type == 25);
UNUSED(type);
UNUSED(rdclass);
UNUSED(origin);
UNUSED(downcase);
......@@ -127,12 +128,13 @@ static inline isc_result_t
fromwire_key(ARGS_FROMWIRE) {
isc_region_t sr;
REQUIRE(type == 25);
UNUSED(type);
UNUSED(rdclass);
UNUSED(dctx);
UNUSED(downcase);
REQUIRE(type == 25);
isc_buffer_activeregion(source, &sr);
if (sr.length < 4)
return (ISC_R_UNEXPECTEDEND);
......@@ -179,6 +181,7 @@ fromstruct_key(ARGS_FROMSTRUCT) {
REQUIRE(key->common.rdtype == type);
REQUIRE(key->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
/* Flags */
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: loc_29.c,v 1.28 2001/03/06 22:10:45 marka Exp $ */
/* $Id: loc_29.c,v 1.29 2001/03/16 22:52:43 bwelling Exp $ */
/* Reviewed: Wed Mar 15 18:13:09 PST 2000 by explorer */
......@@ -50,12 +50,13 @@ fromtext_loc(ARGS_FROMTEXT) {
unsigned long longitude;
unsigned long altitude;
REQUIRE(type == 29);
UNUSED(type);
UNUSED(rdclass);
UNUSED(origin);
UNUSED(downcase);
REQUIRE(type == 29);
/*
* Defaults.
*/
......@@ -527,12 +528,13 @@ fromwire_loc(ARGS_FROMWIRE) {
unsigned long latitude;
unsigned long longitude;
REQUIRE(type == 29);
UNUSED(type);
UNUSED(rdclass);
UNUSED(dctx);
UNUSED(downcase);
REQUIRE(type == 29);
isc_buffer_activeregion(source, &sr);
if (sr.length < 1)
return (ISC_R_UNEXPECTEDEND);
......@@ -629,6 +631,7 @@ fromstruct_loc(ARGS_FROMSTRUCT) {
REQUIRE(loc->common.rdtype == type);
REQUIRE(loc->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
if (loc->v.v0.version != 0)
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: mb_7.c,v 1.39 2001/03/06 22:10:47 marka Exp $ */
/* $Id: mb_7.c,v 1.40 2001/03/16 22:52:44 bwelling Exp $ */
/* Reviewed: Wed Mar 15 17:31:26 PST 2000 by bwelling */
......@@ -30,10 +30,11 @@ fromtext_mb(ARGS_FROMTEXT) {
dns_name_t name;
isc_buffer_t buffer;
UNUSED(rdclass);
REQUIRE(type == 7);
UNUSED(type);
UNUSED(rdclass);
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
ISC_FALSE));
......@@ -69,10 +70,11 @@ static inline isc_result_t
fromwire_mb(ARGS_FROMWIRE) {
dns_name_t name;
UNUSED(rdclass);
REQUIRE(type == 7);
UNUSED(type);
UNUSED(rdclass);
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);
......@@ -132,6 +134,7 @@ fromstruct_mb(ARGS_FROMSTRUCT) {
REQUIRE(mb->common.rdtype == type);
REQUIRE(mb->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
dns_name_toregion(&mb->mb, &region);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: md_3.c,v 1.41 2001/03/06 22:10:48 marka Exp $ */
/* $Id: md_3.c,v 1.42 2001/03/16 22:52:45 bwelling Exp $ */
/* Reviewed: Wed Mar 15 17:48:20 PST 2000 by bwelling */
......@@ -30,10 +30,11 @@ fromtext_md(ARGS_FROMTEXT) {
dns_name_t name;
isc_buffer_t buffer;
UNUSED(rdclass);
REQUIRE(type == 3);
UNUSED(type);
UNUSED(rdclass);
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
ISC_FALSE));
......@@ -69,10 +70,11 @@ static inline isc_result_t
fromwire_md(ARGS_FROMWIRE) {
dns_name_t name;
UNUSED(rdclass);
REQUIRE(type == 3);
UNUSED(type);
UNUSED(rdclass);
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);
......@@ -132,6 +134,7 @@ fromstruct_md(ARGS_FROMSTRUCT) {
REQUIRE(md->common.rdtype == type);
REQUIRE(md->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
dns_name_toregion(&md->md, &region);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: mf_4.c,v 1.39 2001/03/06 22:10:49 marka Exp $ */
/* $Id: mf_4.c,v 1.40 2001/03/16 22:52:46 bwelling Exp $ */
/* reviewed: Wed Mar 15 17:47:33 PST 2000 by brister */
......@@ -32,6 +32,7 @@ fromtext_mf(ARGS_FROMTEXT) {
REQUIRE(type == 4);
UNUSED(type);
UNUSED(rdclass);
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
......@@ -71,6 +72,7 @@ fromwire_mf(ARGS_FROMWIRE) {
REQUIRE(type == 4);
UNUSED(type);
UNUSED(rdclass);
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
......@@ -132,6 +134,7 @@ fromstruct_mf(ARGS_FROMSTRUCT) {
REQUIRE(mf->common.rdtype == type);
REQUIRE(mf->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
dns_name_toregion(&mf->mf, &region);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: mg_8.c,v 1.37 2001/03/06 22:10:50 marka Exp $ */
/* $Id: mg_8.c,v 1.38 2001/03/16 22:52:47 bwelling Exp $ */
/* reviewed: Wed Mar 15 17:49:21 PST 2000 by brister */
......@@ -32,6 +32,7 @@ fromtext_mg(ARGS_FROMTEXT) {
REQUIRE(type == 8);
UNUSED(type);
UNUSED(rdclass);
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
......@@ -71,6 +72,7 @@ fromwire_mg(ARGS_FROMWIRE) {
REQUIRE(type == 8);
UNUSED(type);
UNUSED(rdclass);
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
......@@ -132,6 +134,7 @@ fromstruct_mg(ARGS_FROMSTRUCT) {
REQUIRE(mg->common.rdtype == type);
REQUIRE(mg->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
dns_name_toregion(&mg->mg, &region);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: minfo_14.c,v 1.38 2001/03/06 22:10:51 marka Exp $ */
/* $Id: minfo_14.c,v 1.39 2001/03/16 22:52:49 bwelling Exp $ */
/* reviewed: Wed Mar 15 17:45:32 PST 2000 by brister */
......@@ -33,6 +33,7 @@ fromtext_minfo(ARGS_FROMTEXT) {
REQUIRE(type == 14);
UNUSED(type);
UNUSED(rdclass);
for (i = 0; i < 2 ; i++) {
......@@ -88,10 +89,11 @@ fromwire_minfo(ARGS_FROMWIRE) {
REQUIRE(type == 14);
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
UNUSED(type);
UNUSED(rdclass);
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&rmail, NULL);
dns_name_init(&email, NULL);
......@@ -178,6 +180,7 @@ fromstruct_minfo(ARGS_FROMSTRUCT) {
REQUIRE(minfo->common.rdtype == type);
REQUIRE(minfo->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
dns_name_toregion(&minfo->rmailbox, &region);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: mr_9.c,v 1.36 2001/03/06 22:10:52 marka Exp $ */
/* $Id: mr_9.c,v 1.37 2001/03/16 22:52:50 bwelling Exp $ */
/* Reviewed: Wed Mar 15 21:30:35 EST 2000 by tale */
......@@ -32,6 +32,7 @@ fromtext_mr(ARGS_FROMTEXT) {
REQUIRE(type == 9);
UNUSED(type);
UNUSED(rdclass);
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
......@@ -71,6 +72,7 @@ fromwire_mr(ARGS_FROMWIRE) {
REQUIRE(type == 9);
UNUSED(type);
UNUSED(rdclass);
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
......@@ -132,6 +134,7 @@ fromstruct_mr(ARGS_FROMSTRUCT) {
REQUIRE(mr->common.rdtype == type);
REQUIRE(mr->common.rdclass == rdclass);
UNUSED(type);
UNUSED(rdclass);
dns_name_toregion(&mr->mr, &region);
......