From 63cef8bde8b92aeb30ccdcf21d4e44c9be9cc6e3 Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Fri, 1 Dec 2000 01:40:59 +0000
Subject: [PATCH] added UNUSED() macros for arguments that end up unused when
 assertion checking is turned off

---
 lib/dns/rdata/any_255/tsig_250.c   |  8 +++++++-
 lib/dns/rdata/generic/afsdb_18.c   |  4 +++-
 lib/dns/rdata/generic/cert_37.c    |  4 +++-
 lib/dns/rdata/generic/cname_5.c    |  4 +++-
 lib/dns/rdata/generic/dname_39.c   |  4 +++-
 lib/dns/rdata/generic/gpos_27.c    |  4 +++-
 lib/dns/rdata/generic/hinfo_13.c   |  4 +++-
 lib/dns/rdata/generic/isdn_20.c    |  4 +++-
 lib/dns/rdata/generic/key_25.c     | 12 +++++++-----
 lib/dns/rdata/generic/loc_29.c     |  5 ++++-
 lib/dns/rdata/generic/mb_7.c       |  4 +++-
 lib/dns/rdata/generic/md_3.c       |  4 +++-
 lib/dns/rdata/generic/mf_4.c       |  4 +++-
 lib/dns/rdata/generic/mg_8.c       |  4 +++-
 lib/dns/rdata/generic/minfo_14.c   |  4 +++-
 lib/dns/rdata/generic/mr_9.c       |  4 +++-
 lib/dns/rdata/generic/mx_15.c      |  4 +++-
 lib/dns/rdata/generic/ns_2.c       |  4 +++-
 lib/dns/rdata/generic/null_10.c    |  4 +++-
 lib/dns/rdata/generic/nxt_30.c     |  4 +++-
 lib/dns/rdata/generic/opt_41.c     |  4 +++-
 lib/dns/rdata/generic/ptr_12.c     |  4 +++-
 lib/dns/rdata/generic/rp_17.c      |  4 +++-
 lib/dns/rdata/generic/rt_21.c      |  4 +++-
 lib/dns/rdata/generic/sig_24.c     |  4 +++-
 lib/dns/rdata/generic/soa_6.c      |  4 +++-
 lib/dns/rdata/generic/tkey_249.c   |  4 +++-
 lib/dns/rdata/generic/txt_16.c     |  4 +++-
 lib/dns/rdata/generic/unspec_103.c |  4 +++-
 lib/dns/rdata/generic/x25_19.c     |  4 +++-
 lib/dns/rdata/hs_4/a_1.c           |  7 +++++--
 lib/dns/rdata/in_1/a6_38.c         |  8 +++++++-
 lib/dns/rdata/in_1/a_1.c           |  4 +++-
 lib/dns/rdata/in_1/aaaa_28.c       | 20 +++++++++++++-------
 lib/dns/rdata/in_1/kx_36.c         |  8 +++++++-
 lib/dns/rdata/in_1/naptr_35.c      |  8 +++++++-
 lib/dns/rdata/in_1/nsap-ptr_23.c   |  8 +++++++-
 lib/dns/rdata/in_1/nsap_22.c       |  6 +++++-
 lib/dns/rdata/in_1/px_26.c         |  8 +++++++-
 lib/dns/rdata/in_1/srv_33.c        |  8 +++++++-
 lib/dns/rdata/in_1/wks_11.c        | 18 +++++++++++-------
 41 files changed, 178 insertions(+), 58 deletions(-)

diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index 698e25dc9f..34414521b2 100644
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsig_250.c,v 1.45 2000/11/08 01:55:31 bwelling Exp $ */
+/* $Id: tsig_250.c,v 1.46 2000/12/01 01:40:14 gson Exp $ */
 
 /* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */
 
@@ -38,6 +38,8 @@ fromtext_any_tsig(ARGS_FROMTEXT) {
 	REQUIRE(type == 250);
 	REQUIRE(rdclass == 255);
 
+	UNUSED(rdclass);
+
 	/*
 	 * Algorithm Name.
 	 */
@@ -247,6 +249,8 @@ fromwire_any_tsig(ARGS_FROMWIRE) {
 	REQUIRE(type == 250);
 	REQUIRE(rdclass == 255);
 
+	UNUSED(rdclass);
+
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
 
 	/*
@@ -356,6 +360,8 @@ fromstruct_any_tsig(ARGS_FROMSTRUCT) {
 	REQUIRE(tsig->common.rdclass == rdclass);
 	REQUIRE(tsig->common.rdtype == type);
 
+	UNUSED(rdclass);
+
 	/*
 	 * Algorithm Name.
 	 */
diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c
index 7fd15c456f..98371710e1 100644
--- a/lib/dns/rdata/generic/afsdb_18.c
+++ b/lib/dns/rdata/generic/afsdb_18.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: afsdb_18.c,v 1.33 2000/11/08 01:55:33 bwelling Exp $ */
+/* $Id: afsdb_18.c,v 1.34 2000/12/01 01:40:15 gson Exp $ */
 
 /* Reviewed: Wed Mar 15 14:59:00 PST 2000 by explorer */
 
@@ -174,6 +174,8 @@ fromstruct_afsdb(ARGS_FROMSTRUCT) {
 	REQUIRE(afsdb->common.rdclass == rdclass);
 	REQUIRE(afsdb->common.rdtype == type);
 
+	UNUSED(rdclass);
+
 	RETERR(uint16_tobuffer(afsdb->subtype, target));
 	dns_name_toregion(&afsdb->server, &region);
 	return (isc_buffer_copyregion(target, &region));
diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c
index 2b646d5d50..6f866bc75d 100644
--- a/lib/dns/rdata/generic/cert_37.c
+++ b/lib/dns/rdata/generic/cert_37.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cert_37.c,v 1.34 2000/11/08 01:55:34 bwelling Exp $ */
+/* $Id: cert_37.c,v 1.35 2000/12/01 01:40:16 gson Exp $ */
 
 /* Reviewed: Wed Mar 15 21:14:32 EST 2000 by tale */
 
@@ -170,6 +170,8 @@ fromstruct_cert(ARGS_FROMSTRUCT) {
 	REQUIRE(cert->common.rdtype == type);
 	REQUIRE(cert->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	RETERR(uint16_tobuffer(cert->type, target));
 	RETERR(uint16_tobuffer(cert->key_tag, target));
 	RETERR(uint8_tobuffer(cert->algorithm, target));
diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c
index eadc2bdd45..fa657a8dc7 100644
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cname_5.c,v 1.37 2000/11/08 01:55:35 bwelling Exp $ */
+/* $Id: cname_5.c,v 1.38 2000/12/01 01:40:17 gson Exp $ */
 
 /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
 
@@ -131,6 +131,8 @@ fromstruct_cname(ARGS_FROMSTRUCT) {
 	REQUIRE(cname->common.rdtype == type);
 	REQUIRE(cname->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	dns_name_toregion(&cname->cname, &region);
 	return (isc_buffer_copyregion(target, &region));
 }
diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c
index f911f75e84..674bb4d841 100644
--- a/lib/dns/rdata/generic/dname_39.c
+++ b/lib/dns/rdata/generic/dname_39.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dname_39.c,v 1.27 2000/11/08 01:55:36 bwelling Exp $ */
+/* $Id: dname_39.c,v 1.28 2000/12/01 01:40:18 gson Exp $ */
 
 /* Reviewed: Wed Mar 15 16:52:38 PST 2000 by explorer */
 
@@ -131,6 +131,8 @@ fromstruct_dname(ARGS_FROMSTRUCT) {
 	REQUIRE(dname->common.rdtype == type);
 	REQUIRE(dname->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	dns_name_toregion(&dname->dname, &region);
 	return (isc_buffer_copyregion(target, &region));
 }
diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c
index bede48d50c..9a4c1691b0 100644
--- a/lib/dns/rdata/generic/gpos_27.c
+++ b/lib/dns/rdata/generic/gpos_27.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gpos_27.c,v 1.26 2000/11/08 01:55:38 bwelling Exp $ */
+/* $Id: gpos_27.c,v 1.27 2000/12/01 01:40:19 gson Exp $ */
 
 /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
 
@@ -118,6 +118,8 @@ fromstruct_gpos(ARGS_FROMSTRUCT) {
 	REQUIRE(gpos->common.rdtype == type);
 	REQUIRE(gpos->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	RETERR(uint8_tobuffer(gpos->long_len, target));
 	RETERR(mem_tobuffer(target, gpos->longitude, gpos->long_len));
 	RETERR(uint8_tobuffer(gpos->lat_len, target));
diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c
index 331577f5b5..4b3e233a60 100644
--- a/lib/dns/rdata/generic/hinfo_13.c
+++ b/lib/dns/rdata/generic/hinfo_13.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hinfo_13.c,v 1.31 2000/11/08 01:55:39 bwelling Exp $ */
+/* $Id: hinfo_13.c,v 1.32 2000/12/01 01:40:21 gson Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@@ -110,6 +110,8 @@ fromstruct_hinfo(ARGS_FROMSTRUCT) {
 	REQUIRE(hinfo->common.rdtype == type);
 	REQUIRE(hinfo->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	RETERR(uint8_tobuffer(hinfo->cpu_len, target));
 	RETERR(mem_tobuffer(target, hinfo->cpu, hinfo->cpu_len));
 	RETERR(uint8_tobuffer(hinfo->os_len, target));
diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c
index d92c1d3563..bdcb010013 100644
--- a/lib/dns/rdata/generic/isdn_20.c
+++ b/lib/dns/rdata/generic/isdn_20.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: isdn_20.c,v 1.24 2000/11/08 01:55:40 bwelling Exp $ */
+/* $Id: isdn_20.c,v 1.25 2000/12/01 01:40:22 gson Exp $ */
 
 /* Reviewed: Wed Mar 15 16:53:11 PST 2000 by bwelling */
 
@@ -118,6 +118,8 @@ fromstruct_isdn(ARGS_FROMSTRUCT) {
 	REQUIRE(isdn->common.rdtype == type);
 	REQUIRE(isdn->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	RETERR(uint8_tobuffer(isdn->isdn_len, target));
 	RETERR(mem_tobuffer(target, isdn->isdn, isdn->isdn_len));
 	RETERR(uint8_tobuffer(isdn->subaddress_len, target));
diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index f18b656184..b72f395694 100644
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: key_25.c,v 1.34 2000/11/08 01:55:41 bwelling Exp $ */
+/* $Id: key_25.c,v 1.35 2000/12/01 01:40:23 gson Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@@ -37,12 +37,12 @@ fromtext_key(ARGS_FROMTEXT) {
 	dns_secproto_t proto;
 	dns_keyflags_t flags;
 
+	REQUIRE(type == 25);
+
 	UNUSED(rdclass);
 	UNUSED(origin);
 	UNUSED(downcase);
 
-	REQUIRE(type == 25);
-
 	/* flags */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      ISC_FALSE));
@@ -145,11 +145,11 @@ static inline isc_result_t
 towire_key(ARGS_TOWIRE) {
 	isc_region_t sr;
 
-	UNUSED(cctx);
-
 	REQUIRE(rdata->type == 25);
 	REQUIRE(rdata->length != 0);
 
+	UNUSED(cctx);
+
 	dns_rdata_toregion(rdata, &sr);
 	return (mem_tobuffer(target, sr.base, sr.length));
 }
@@ -179,6 +179,8 @@ fromstruct_key(ARGS_FROMSTRUCT) {
 	REQUIRE(key->common.rdtype == type);
 	REQUIRE(key->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	/* Flags */
 	RETERR(uint16_tobuffer(key->flags, target));
 
diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c
index 255ebc9306..7053a4ec1b 100644
--- a/lib/dns/rdata/generic/loc_29.c
+++ b/lib/dns/rdata/generic/loc_29.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: loc_29.c,v 1.25 2000/11/08 01:55:42 bwelling Exp $ */
+/* $Id: loc_29.c,v 1.26 2000/12/01 01:40:24 gson Exp $ */
 
 /* Reviewed: Wed Mar 15 18:13:09 PST 2000 by explorer */
 
@@ -629,6 +629,8 @@ fromstruct_loc(ARGS_FROMSTRUCT) {
 	REQUIRE(loc->common.rdtype == type);
 	REQUIRE(loc->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	if (loc->v.v0.version != 0)
 		return (ISC_R_NOTIMPLEMENTED);
 	RETERR(uint8_tobuffer(loc->v.v0.version, target));
@@ -706,6 +708,7 @@ freestruct_loc(ARGS_FREESTRUCT) {
 	REQUIRE(loc->common.rdtype == 29);
 
 	UNUSED(source);
+	UNUSED(loc);
 }
 
 static inline isc_result_t
diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index 04251a9c29..77d4f5f4bc 100644
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mb_7.c,v 1.35 2000/11/08 01:55:44 bwelling Exp $ */
+/* $Id: mb_7.c,v 1.36 2000/12/01 01:40:25 gson Exp $ */
 
 /* Reviewed: Wed Mar 15 17:31:26 PST 2000 by bwelling */
 
@@ -130,6 +130,8 @@ fromstruct_mb(ARGS_FROMSTRUCT) {
 	REQUIRE(mb->common.rdtype == type);
 	REQUIRE(mb->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	dns_name_toregion(&mb->mb, &region);
 	return (isc_buffer_copyregion(target, &region));
 }
diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index c4605f57c9..ab1cc6cdab 100644
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: md_3.c,v 1.37 2000/11/08 01:55:45 bwelling Exp $ */
+/* $Id: md_3.c,v 1.38 2000/12/01 01:40:26 gson Exp $ */
 
 /* Reviewed: Wed Mar 15 17:48:20 PST 2000 by bwelling */
 
@@ -130,6 +130,8 @@ fromstruct_md(ARGS_FROMSTRUCT) {
 	REQUIRE(md->common.rdtype == type);
 	REQUIRE(md->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	dns_name_toregion(&md->md, &region);
 	return (isc_buffer_copyregion(target, &region));
 }
diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index 9946cb2f81..feb1ae471c 100644
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mf_4.c,v 1.35 2000/11/08 01:55:46 bwelling Exp $ */
+/* $Id: mf_4.c,v 1.36 2000/12/01 01:40:27 gson Exp $ */
 
 /* reviewed: Wed Mar 15 17:47:33 PST 2000 by brister */
 
@@ -130,6 +130,8 @@ fromstruct_mf(ARGS_FROMSTRUCT) {
 	REQUIRE(mf->common.rdtype == type);
 	REQUIRE(mf->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	dns_name_toregion(&mf->mf, &region);
 	return (isc_buffer_copyregion(target, &region));
 }
diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c
index 43e6070659..a8dfcf11f3 100644
--- a/lib/dns/rdata/generic/mg_8.c
+++ b/lib/dns/rdata/generic/mg_8.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mg_8.c,v 1.33 2000/11/08 01:55:47 bwelling Exp $ */
+/* $Id: mg_8.c,v 1.34 2000/12/01 01:40:28 gson Exp $ */
 
 /* reviewed: Wed Mar 15 17:49:21 PST 2000 by brister */
 
@@ -130,6 +130,8 @@ fromstruct_mg(ARGS_FROMSTRUCT) {
 	REQUIRE(mg->common.rdtype == type);
 	REQUIRE(mg->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	dns_name_toregion(&mg->mg, &region);
 	return (isc_buffer_copyregion(target, &region));
 }
diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c
index db353bb290..2ecf0bbd22 100644
--- a/lib/dns/rdata/generic/minfo_14.c
+++ b/lib/dns/rdata/generic/minfo_14.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: minfo_14.c,v 1.34 2000/11/08 01:55:48 bwelling Exp $ */
+/* $Id: minfo_14.c,v 1.35 2000/12/01 01:40:30 gson Exp $ */
 
 /* reviewed: Wed Mar 15 17:45:32 PST 2000 by brister */
 
@@ -176,6 +176,8 @@ fromstruct_minfo(ARGS_FROMSTRUCT) {
 	REQUIRE(minfo->common.rdtype == type);
 	REQUIRE(minfo->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	dns_name_toregion(&minfo->rmailbox, &region);
 	RETERR(isc_buffer_copyregion(target, &region));
 	dns_name_toregion(&minfo->emailbox, &region);
diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c
index 576fc8f79b..c9751d874e 100644
--- a/lib/dns/rdata/generic/mr_9.c
+++ b/lib/dns/rdata/generic/mr_9.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mr_9.c,v 1.32 2000/11/08 01:55:49 bwelling Exp $ */
+/* $Id: mr_9.c,v 1.33 2000/12/01 01:40:31 gson Exp $ */
 
 /* Reviewed: Wed Mar 15 21:30:35 EST 2000 by tale */
 
@@ -130,6 +130,8 @@ fromstruct_mr(ARGS_FROMSTRUCT) {
 	REQUIRE(mr->common.rdtype == type);
 	REQUIRE(mr->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	dns_name_toregion(&mr->mr, &region);
 	return (isc_buffer_copyregion(target, &region));
 }
diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index 54e92d33a2..480e8340ca 100644
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mx_15.c,v 1.42 2000/11/08 01:55:50 bwelling Exp $ */
+/* $Id: mx_15.c,v 1.43 2000/12/01 01:40:32 gson Exp $ */
 
 /* reviewed: Wed Mar 15 18:05:46 PST 2000 by brister */
 
@@ -160,6 +160,8 @@ fromstruct_mx(ARGS_FROMSTRUCT) {
 	REQUIRE(mx->common.rdtype == type);
 	REQUIRE(mx->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	RETERR(uint16_tobuffer(mx->pref, target));
 	dns_name_toregion(&mx->mx, &region);
 	return (isc_buffer_copyregion(target, &region));
diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c
index c9e6aeb0b9..f9448e7762 100644
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ns_2.c,v 1.36 2000/11/08 01:55:52 bwelling Exp $ */
+/* $Id: ns_2.c,v 1.37 2000/12/01 01:40:33 gson Exp $ */
 
 /* Reviewed: Wed Mar 15 18:15:00 PST 2000 by bwelling */
 
@@ -130,6 +130,8 @@ fromstruct_ns(ARGS_FROMSTRUCT) {
 	REQUIRE(ns->common.rdtype == type);
 	REQUIRE(ns->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	dns_name_toregion(&ns->name, &region);
 	return (isc_buffer_copyregion(target, &region));
 }
diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c
index 5a81d8ddea..d82159b45f 100644
--- a/lib/dns/rdata/generic/null_10.c
+++ b/lib/dns/rdata/generic/null_10.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: null_10.c,v 1.29 2000/10/25 05:43:47 marka Exp $ */
+/* $Id: null_10.c,v 1.30 2000/12/01 01:40:34 gson Exp $ */
 
 /* Reviewed: Thu Mar 16 13:57:50 PST 2000 by explorer */
 
@@ -100,6 +100,8 @@ fromstruct_null(ARGS_FROMSTRUCT) {
 	REQUIRE((null->data != NULL && null->length != 0) ||
 		(null->data == NULL && null->length == 0));
 
+	UNUSED(rdclass);
+
 	return (mem_tobuffer(target, null->data, null->length));
 }
 
diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index b5743922fa..71627f3647 100644
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nxt_30.c,v 1.43 2000/11/14 18:14:44 gson Exp $ */
+/* $Id: nxt_30.c,v 1.44 2000/12/01 01:40:35 gson Exp $ */
 
 /* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */
 
@@ -203,6 +203,8 @@ fromstruct_nxt(ARGS_FROMSTRUCT) {
 	REQUIRE(nxt->common.rdclass == rdclass);
 	REQUIRE(nxt->typebits != NULL || nxt->len == 0);
 
+	UNUSED(rdclass);
+
 	dns_name_toregion(&nxt->next, &region);
 	RETERR(isc_buffer_copyregion(target, &region));
 
diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index c8bd926294..af1bb634d1 100644
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: opt_41.c,v 1.18 2000/08/01 01:25:48 tale Exp $ */
+/* $Id: opt_41.c,v 1.19 2000/12/01 01:40:36 gson Exp $ */
 
 /* Reviewed: Thu Mar 16 14:06:44 PST 2000 by gson */
 
@@ -167,6 +167,8 @@ fromstruct_opt(ARGS_FROMSTRUCT) {
 	REQUIRE((opt->options != NULL && opt->length != 0) ||
 		(opt->options == NULL && opt->length == 0));
 
+	UNUSED(rdclass);
+
 	region.base = opt->options;
 	region.length = opt->length;
 	while (region.length >= 4) {
diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c
index f298583ac7..08f06ceb41 100644
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ptr_12.c,v 1.33 2000/11/08 01:55:55 bwelling Exp $ */
+/* $Id: ptr_12.c,v 1.34 2000/12/01 01:40:37 gson Exp $ */
 
 /* Reviewed: Thu Mar 16 14:05:12 PST 2000 by explorer */
 
@@ -130,6 +130,8 @@ fromstruct_ptr(ARGS_FROMSTRUCT) {
 	REQUIRE(ptr->common.rdtype == type);
 	REQUIRE(ptr->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	dns_name_toregion(&ptr->ptr, &region);
 	return (isc_buffer_copyregion(target, &region));
 }
diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c
index f7265d68c4..24491c10fb 100644
--- a/lib/dns/rdata/generic/rp_17.c
+++ b/lib/dns/rdata/generic/rp_17.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rp_17.c,v 1.29 2000/11/08 01:55:56 bwelling Exp $ */
+/* $Id: rp_17.c,v 1.30 2000/12/01 01:40:39 gson Exp $ */
 
 /* RFC 1183 */
 
@@ -174,6 +174,8 @@ fromstruct_rp(ARGS_FROMSTRUCT) {
 	REQUIRE(rp->common.rdtype == type);
 	REQUIRE(rp->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	dns_name_toregion(&rp->mail, &region);
 	RETERR(isc_buffer_copyregion(target, &region));
 	dns_name_toregion(&rp->text, &region);
diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c
index 95a7100033..86db615e6c 100644
--- a/lib/dns/rdata/generic/rt_21.c
+++ b/lib/dns/rdata/generic/rt_21.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rt_21.c,v 1.31 2000/11/08 01:55:57 bwelling Exp $ */
+/* $Id: rt_21.c,v 1.32 2000/12/01 01:40:40 gson Exp $ */
 
 /* reviewed: Thu Mar 16 15:02:31 PST 2000 by brister */
 
@@ -169,6 +169,8 @@ fromstruct_rt(ARGS_FROMSTRUCT) {
 	REQUIRE(rt->common.rdtype == type);
 	REQUIRE(rt->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	RETERR(uint16_tobuffer(rt->preference, target));
 	dns_name_toregion(&rt->host, &region);
 	return (isc_buffer_copyregion(target, &region));
diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index b9a0872742..ccb533873a 100644
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sig_24.c,v 1.47 2000/11/08 01:55:58 bwelling Exp $ */
+/* $Id: sig_24.c,v 1.48 2000/12/01 01:40:41 gson Exp $ */
 
 /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
 
@@ -364,6 +364,8 @@ fromstruct_sig(ARGS_FROMSTRUCT) {
 	REQUIRE((sig->signature != NULL && sig->siglen != 0) ||
 		(sig->signature == NULL && sig->siglen == 0));
 
+	UNUSED(rdclass);
+
 	/*
 	 * Type covered.
 	 */
diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index 381e7ed216..2d6e72dc2a 100644
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: soa_6.c,v 1.46 2000/11/08 01:55:59 bwelling Exp $ */
+/* $Id: soa_6.c,v 1.47 2000/12/01 01:40:42 gson Exp $ */
 
 /* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */
 
@@ -263,6 +263,8 @@ fromstruct_soa(ARGS_FROMSTRUCT) {
 	REQUIRE(soa->common.rdtype == type);
 	REQUIRE(soa->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	dns_name_toregion(&soa->origin, &region);
 	RETERR(isc_buffer_copyregion(target, &region));
 	dns_name_toregion(&soa->mname, &region);
diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index d49d2bd642..c5af1a81d1 100644
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkey_249.c,v 1.40 2000/11/08 01:56:01 bwelling Exp $ */
+/* $Id: tkey_249.c,v 1.41 2000/12/01 01:40:43 gson Exp $ */
 
 /*
  * Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley.
@@ -352,6 +352,8 @@ fromstruct_tkey(ARGS_FROMSTRUCT) {
 	REQUIRE((tkey->other == NULL && tkey->otherlen == 0) ||
 		(tkey->other != NULL && tkey->otherlen != 0));
 
+	UNUSED(rdclass);
+
 	/*
 	 * Algorithm Name.
 	 */
diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c
index e38ee12c30..4e1a4f37d5 100644
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: txt_16.c,v 1.31 2000/11/08 01:56:02 bwelling Exp $ */
+/* $Id: txt_16.c,v 1.32 2000/12/01 01:40:44 gson Exp $ */
 
 /* Reviewed: Thu Mar 16 15:40:00 PST 2000 by bwelling */
 
@@ -129,6 +129,8 @@ fromstruct_txt(ARGS_FROMSTRUCT) {
 	REQUIRE((txt->txt == NULL && txt->txt_len == 0) ||
 		(txt->txt != NULL && txt->txt_len != 0));
 
+	UNUSED(rdclass);
+
 	region.base = txt->txt;
 	region.length = txt->txt_len;
 	while (region.length > 0) {
diff --git a/lib/dns/rdata/generic/unspec_103.c b/lib/dns/rdata/generic/unspec_103.c
index 22abfe808f..9d8e8c6070 100644
--- a/lib/dns/rdata/generic/unspec_103.c
+++ b/lib/dns/rdata/generic/unspec_103.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: unspec_103.c,v 1.23 2000/08/01 01:26:09 tale Exp $ */
+/* $Id: unspec_103.c,v 1.24 2000/12/01 01:40:45 gson Exp $ */
 
 #ifndef RDATA_GENERIC_UNSPEC_103_C
 #define RDATA_GENERIC_UNSPEC_103_C
@@ -94,6 +94,8 @@ fromstruct_unspec(ARGS_FROMSTRUCT) {
 	REQUIRE((unspec->data != NULL && unspec->datalen != 0) ||
 		(unspec->data == NULL && unspec->datalen == 0));
 
+	UNUSED(rdclass);
+
 	return (mem_tobuffer(target, unspec->data, unspec->datalen));
 }
 
diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c
index b34e7b8a0c..1fb64f508e 100644
--- a/lib/dns/rdata/generic/x25_19.c
+++ b/lib/dns/rdata/generic/x25_19.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: x25_19.c,v 1.25 2000/11/08 01:56:03 bwelling Exp $ */
+/* $Id: x25_19.c,v 1.26 2000/12/01 01:40:46 gson Exp $ */
 
 /* Reviewed: Thu Mar 16 16:15:57 PST 2000 by bwelling */
 
@@ -114,6 +114,8 @@ fromstruct_x25(ARGS_FROMSTRUCT) {
 	REQUIRE((x25->x25 == NULL && x25->x25_len == 0) ||
 		(x25->x25 != NULL && x25->x25_len != 0));
 
+	UNUSED(rdclass);
+
 	for (i = 0; i < x25->x25_len; i++)
 		if (!isdigit(x25->x25[i] & 0xff))
 			return (ISC_R_RANGE);
diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c
index 3a940c504d..bc835c3723 100644
--- a/lib/dns/rdata/hs_4/a_1.c
+++ b/lib/dns/rdata/hs_4/a_1.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a_1.c,v 1.19 2000/11/08 01:56:04 bwelling Exp $ */
+/* $Id: a_1.c,v 1.20 2000/12/01 01:40:48 gson Exp $ */
 
 /* reviewed: Thu Mar 16 15:58:36 PST 2000 by brister */
 
@@ -37,6 +37,7 @@ fromtext_hs_a(ARGS_FROMTEXT) {
 
 	UNUSED(origin);
 	UNUSED(downcase);
+	UNUSED(rdclass);
 
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      ISC_FALSE));
@@ -80,7 +81,7 @@ fromwire_hs_a(ARGS_FROMWIRE) {
 
 	UNUSED(dctx);
 	UNUSED(downcase);
-
+	UNUSED(rdclass);
 
 	isc_buffer_activeregion(source, &sregion);
 	isc_buffer_availableregion(target, &tregion);
@@ -142,6 +143,8 @@ fromstruct_hs_a(ARGS_FROMSTRUCT) {
 	REQUIRE(a->common.rdtype == type);
 	REQUIRE(a->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	n = ntohl(a->in_addr.s_addr);
 
 	return (uint32_tobuffer(n, target));
diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c
index b68017b578..b50e40682c 100644
--- a/lib/dns/rdata/in_1/a6_38.c
+++ b/lib/dns/rdata/in_1/a6_38.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a6_38.c,v 1.38 2000/11/08 01:56:05 bwelling Exp $ */
+/* $Id: a6_38.c,v 1.39 2000/12/01 01:40:49 gson Exp $ */
 
 /* draft-ietf-ipngwg-dns-lookups-03.txt */
 
@@ -39,6 +39,8 @@ fromtext_in_a6(ARGS_FROMTEXT) {
 	REQUIRE(type == 38);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(rdclass);
+
 	/*
 	 * Prefix length.
 	 */
@@ -144,6 +146,8 @@ fromwire_in_a6(ARGS_FROMWIRE) {
 	REQUIRE(type == 38);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(rdclass);
+
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
 
 	isc_buffer_activeregion(source, &sr);
@@ -276,6 +280,8 @@ fromstruct_in_a6(ARGS_FROMSTRUCT) {
 	REQUIRE(a6->common.rdtype == type);
 	REQUIRE(a6->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	if (a6->prefixlen > 128)
 		return (ISC_R_RANGE);
 
diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c
index 46c6a63c8c..2e2563beb1 100644
--- a/lib/dns/rdata/in_1/a_1.c
+++ b/lib/dns/rdata/in_1/a_1.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a_1.c,v 1.40 2000/11/08 01:56:07 bwelling Exp $ */
+/* $Id: a_1.c,v 1.41 2000/12/01 01:40:50 gson Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -182,6 +182,8 @@ freestruct_in_a(ARGS_FREESTRUCT) {
 	REQUIRE(source != NULL);
 	REQUIRE(a->common.rdtype == 1);
 	REQUIRE(a->common.rdclass == 1);
+
+	UNUSED(a);
 }
 
 static inline isc_result_t
diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c
index 3f0045c487..704dd01fb9 100644
--- a/lib/dns/rdata/in_1/aaaa_28.c
+++ b/lib/dns/rdata/in_1/aaaa_28.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: aaaa_28.c,v 1.30 2000/11/08 01:56:08 bwelling Exp $ */
+/* $Id: aaaa_28.c,v 1.31 2000/12/01 01:40:51 gson Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -34,12 +34,13 @@ fromtext_in_aaaa(ARGS_FROMTEXT) {
 	unsigned char addr[16];
 	isc_region_t region;
 
-	UNUSED(origin);
-	UNUSED(downcase);
-
 	REQUIRE(type == 28);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(origin);
+	UNUSED(downcase);
+	UNUSED(rdclass);
+
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      ISC_FALSE));
 
@@ -77,12 +78,13 @@ fromwire_in_aaaa(ARGS_FROMWIRE) {
 	isc_region_t sregion;
 	isc_region_t tregion;
 
-	UNUSED(dctx);
-	UNUSED(downcase);
-
 	REQUIRE(type == 28);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(dctx);
+	UNUSED(downcase);
+	UNUSED(rdclass);
+
 	isc_buffer_activeregion(source, &sregion);
 	isc_buffer_availableregion(target, &tregion);
 	if (sregion.length < 16)
@@ -141,6 +143,8 @@ fromstruct_in_aaaa(ARGS_FROMSTRUCT) {
 	REQUIRE(aaaa->common.rdtype == type);
 	REQUIRE(aaaa->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	return (mem_tobuffer(target, aaaa->in6_addr.s6_addr, 16));
 }
 
@@ -174,6 +178,8 @@ freestruct_in_aaaa(ARGS_FREESTRUCT) {
 	REQUIRE(source != NULL);
 	REQUIRE(aaaa->common.rdclass == 1);
 	REQUIRE(aaaa->common.rdtype == 28);
+
+	UNUSED(aaaa);
 }
 
 static inline isc_result_t
diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index a097ac4136..998388d373 100644
--- a/lib/dns/rdata/in_1/kx_36.c
+++ b/lib/dns/rdata/in_1/kx_36.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: kx_36.c,v 1.31 2000/11/08 01:56:09 bwelling Exp $ */
+/* $Id: kx_36.c,v 1.32 2000/12/01 01:40:52 gson Exp $ */
 
 /* Reviewed: Thu Mar 16 17:24:54 PST 2000 by explorer */
 
@@ -35,6 +35,8 @@ fromtext_in_kx(ARGS_FROMTEXT) {
 	REQUIRE(type == 36);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(rdclass);
+
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_number,
 				      ISC_FALSE));
 	if (token.value.as_ulong > 0xffff)
@@ -86,6 +88,8 @@ fromwire_in_kx(ARGS_FROMWIRE) {
 	REQUIRE(type == 36);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(rdclass);
+
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
 
         dns_name_init(&name, NULL);
@@ -163,6 +167,8 @@ fromstruct_in_kx(ARGS_FROMSTRUCT) {
 	REQUIRE(kx->common.rdtype == type);
 	REQUIRE(kx->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	RETERR(uint16_tobuffer(kx->preference, target));
 	dns_name_toregion(&kx->exchange, &region);
 	return (isc_buffer_copyregion(target, &region));
diff --git a/lib/dns/rdata/in_1/naptr_35.c b/lib/dns/rdata/in_1/naptr_35.c
index 7d297e89c0..b64d1532b0 100644
--- a/lib/dns/rdata/in_1/naptr_35.c
+++ b/lib/dns/rdata/in_1/naptr_35.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: naptr_35.c,v 1.35 2000/11/08 01:56:10 bwelling Exp $ */
+/* $Id: naptr_35.c,v 1.36 2000/12/01 01:40:54 gson Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -35,6 +35,8 @@ fromtext_in_naptr(ARGS_FROMTEXT) {
 	REQUIRE(type == 35);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(rdclass);
+
 	/*
 	 * Order.
 	 */
@@ -155,6 +157,8 @@ fromwire_in_naptr(ARGS_FROMWIRE) {
 	REQUIRE(type == 35);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(rdclass);
+
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
 
         dns_name_init(&name, NULL);
@@ -318,6 +322,8 @@ fromstruct_in_naptr(ARGS_FROMSTRUCT) {
 	REQUIRE((naptr->regexp == NULL && naptr->regexp_len == 0) ||
 		(naptr->regexp != NULL && naptr->regexp_len != 0));
 
+	UNUSED(rdclass);
+
 	RETERR(uint16_tobuffer(naptr->order, target));
 	RETERR(uint16_tobuffer(naptr->preference, target));
 	RETERR(uint8_tobuffer(naptr->flags_len, target));
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c
index 244a898980..1b2af670bc 100644
--- a/lib/dns/rdata/in_1/nsap-ptr_23.c
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsap-ptr_23.c,v 1.26 2000/11/08 01:56:11 bwelling Exp $ */
+/* $Id: nsap-ptr_23.c,v 1.27 2000/12/01 01:40:55 gson Exp $ */
 
 /* Reviewed: Fri Mar 17 10:16:02 PST 2000 by gson */
 
@@ -35,6 +35,8 @@ fromtext_in_nsap_ptr(ARGS_FROMTEXT) {
 	REQUIRE(type == 23);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(rdclass);
+
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
 				      ISC_FALSE));
 
@@ -73,6 +75,8 @@ fromwire_in_nsap_ptr(ARGS_FROMWIRE) {
 	REQUIRE(type == 23);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(rdclass);
+
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
 
         dns_name_init(&name, NULL);
@@ -133,6 +137,8 @@ fromstruct_in_nsap_ptr(ARGS_FROMSTRUCT) {
 	REQUIRE(nsap_ptr->common.rdtype == type);
 	REQUIRE(nsap_ptr->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	dns_name_toregion(&nsap_ptr->owner, &region);
 	return (isc_buffer_copyregion(target, &region));
 }
diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c
index 89f3a74875..af1e553523 100644
--- a/lib/dns/rdata/in_1/nsap_22.c
+++ b/lib/dns/rdata/in_1/nsap_22.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsap_22.c,v 1.27 2000/11/08 01:56:12 bwelling Exp $ */
+/* $Id: nsap_22.c,v 1.28 2000/12/01 01:40:56 gson Exp $ */
 
 /* Reviewed: Fri Mar 17 10:41:07 PST 2000 by gson */
 
@@ -39,6 +39,7 @@ fromtext_in_nsap(ARGS_FROMTEXT) {
 
 	UNUSED(origin);
 	UNUSED(downcase);
+	UNUSED(rdclass);
 
 	/* 0x<hex.string.with.periods> */
 	RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
@@ -102,6 +103,7 @@ fromwire_in_nsap(ARGS_FROMWIRE) {
 
 	UNUSED(dctx);
 	UNUSED(downcase);
+	UNUSED(rdclass);
 
 	isc_buffer_activeregion(source, &region);
 	if (region.length < 1)
@@ -152,6 +154,8 @@ fromstruct_in_nsap(ARGS_FROMSTRUCT) {
 	REQUIRE((nsap->nsap == NULL && nsap->nsap_len == 0) ||
 		(nsap->nsap != NULL && nsap->nsap_len != 0));
 
+	UNUSED(rdclass);
+
 	return (mem_tobuffer(target, nsap->nsap, nsap->nsap_len));
 }
 
diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index 30eb4353da..5ca4de98a3 100644
--- a/lib/dns/rdata/in_1/px_26.c
+++ b/lib/dns/rdata/in_1/px_26.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: px_26.c,v 1.28 2000/11/08 01:56:13 bwelling Exp $ */
+/* $Id: px_26.c,v 1.29 2000/12/01 01:40:57 gson Exp $ */
 
 /* Reviewed: Mon Mar 20 10:44:27 PST 2000 */
 
@@ -35,6 +35,8 @@ fromtext_in_px(ARGS_FROMTEXT) {
 	REQUIRE(type == 26);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(rdclass);
+
 	/*
 	 * Preference.
 	 */
@@ -116,6 +118,8 @@ fromwire_in_px(ARGS_FROMWIRE) {
 	REQUIRE(type == 26);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(rdclass);
+
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
 
         dns_name_init(&name, NULL);
@@ -228,6 +232,8 @@ fromstruct_in_px(ARGS_FROMSTRUCT) {
 	REQUIRE(px->common.rdtype == type);
 	REQUIRE(px->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	RETERR(uint16_tobuffer(px->preference, target));
 	dns_name_toregion(&px->map822, &region);
 	RETERR(isc_buffer_copyregion(target, &region));
diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index 4b61cf03c2..7479c65821 100644
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: srv_33.c,v 1.30 2000/11/08 01:56:14 bwelling Exp $ */
+/* $Id: srv_33.c,v 1.31 2000/12/01 01:40:58 gson Exp $ */
 
 /* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */
 
@@ -35,6 +35,8 @@ fromtext_in_srv(ARGS_FROMTEXT) {
 	REQUIRE(type == 33);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(rdclass);
+
 	/*
 	 * Priority.
 	 */
@@ -133,6 +135,8 @@ fromwire_in_srv(ARGS_FROMWIRE) {
 	REQUIRE(type == 33);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(rdclass);
+
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
 
         dns_name_init(&name, NULL);
@@ -227,6 +231,8 @@ fromstruct_in_srv(ARGS_FROMSTRUCT) {
 	REQUIRE(srv->common.rdtype == type);
 	REQUIRE(srv->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	RETERR(uint16_tobuffer(srv->priority, target));
 	RETERR(uint16_tobuffer(srv->weight, target));
 	RETERR(uint16_tobuffer(srv->port, target));
diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index a677e16164..b497af144e 100644
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: wks_11.c,v 1.37 2000/11/08 01:56:15 bwelling Exp $ */
+/* $Id: wks_11.c,v 1.38 2000/12/01 01:40:59 gson Exp $ */
 
 /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */
 
@@ -47,12 +47,13 @@ fromtext_in_wks(ARGS_FROMTEXT) {
 	char service[32];
 	int i;
 
-	UNUSED(origin);
-	UNUSED(downcase);
-
 	REQUIRE(type == 11);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(origin);
+	UNUSED(downcase);
+	UNUSED(rdclass);
+
 	/*
 	 * IPv4 dotted quad.
 	 */
@@ -178,12 +179,13 @@ fromwire_in_wks(ARGS_FROMWIRE) {
 	isc_region_t sr;
 	isc_region_t tr;
 
-	UNUSED(dctx);
-	UNUSED(downcase);
-
 	REQUIRE(type == 11);
 	REQUIRE(rdclass == 1);
 
+	UNUSED(dctx);
+	UNUSED(downcase);
+	UNUSED(rdclass);
+
 	isc_buffer_activeregion(source, &sr);
 	isc_buffer_availableregion(target, &tr);
 
@@ -243,6 +245,8 @@ fromstruct_in_wks(ARGS_FROMSTRUCT) {
 	REQUIRE(wks->common.rdtype == type);
 	REQUIRE(wks->common.rdclass == rdclass);
 
+	UNUSED(rdclass);
+
 	a = ntohl(wks->in_addr.s_addr);
 	RETERR(uint32_tobuffer(a, target));
 	RETERR(uint16_tobuffer(wks->protocol, target));