From: Matthijs Mekking <matthijs@isc.org>
Date: Thu, 4 Jun 2026 06:54:23 +0000 (+0200)
Subject: ISC_ATTR_UNUSED in favor of UNUSED()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=008ad8ade29b96f001597c8c04d6bef4e9859d8f;p=thirdparty%2Fbind9.git

ISC_ATTR_UNUSED in favor of UNUSED()
---

diff --git a/lib/ns/update.c b/lib/ns/update.c
index 04a126d1a99..12bcf5a2c14 100644
--- a/lib/ns/update.c
+++ b/lib/ns/update.c
@@ -717,11 +717,9 @@ typedef bool
 rr_predicate(dns_zone_t *zone, dns_rdata_t *update_rr, dns_rdata_t *db_rr);
 
 static isc_result_t
-count_action(void *data, rr_t *rr) {
+count_action(void *data, rr_t *rr ISC_ATTR_UNUSED) {
 	unsigned int *ui = (unsigned int *)data;
 
-	UNUSED(rr);
-
 	(*ui)++;
 
 	return ISC_R_SUCCESS;
@@ -731,9 +729,7 @@ count_action(void *data, rr_t *rr) {
  * Helper function for rrset_exists().
  */
 static isc_result_t
-rrset_exists_action(void *data, rr_t *rr) {
-	UNUSED(data);
-	UNUSED(rr);
+rrset_exists_action(void *data ISC_ATTR_UNUSED, rr_t *rr ISC_ATTR_UNUSED) {
 	return ISC_R_EXISTS;
 }
 
@@ -774,8 +770,7 @@ rrset_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
  * Helper function for cname_incompatible_rrset_exists.
  */
 static isc_result_t
-cname_compatibility_action(void *data, dns_rdataset_t *rrset) {
-	UNUSED(data);
+cname_compatibility_action(void *data ISC_ATTR_UNUSED, dns_rdataset_t *rrset) {
 	if (rrset->type != dns_rdatatype_cname &&
 	    !dns_rdatatype_atcname(rrset->type))
 	{
@@ -804,9 +799,8 @@ cname_incompatible_rrset_exists(dns_db_t *db, dns_dbversion_t *ver,
  * Helper function for rr_count().
  */
 static isc_result_t
-count_rr_action(void *data, rr_t *rr) {
+count_rr_action(void *data, rr_t *rr ISC_ATTR_UNUSED) {
 	int *countp = data;
-	UNUSED(rr);
 	(*countp)++;
 	return ISC_R_SUCCESS;
 }
@@ -826,9 +820,8 @@ rr_count(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
  */
 
 static isc_result_t
-name_exists_action(void *data, dns_rdataset_t *rrset) {
-	UNUSED(data);
-	UNUSED(rrset);
+name_exists_action(void *data ISC_ATTR_UNUSED,
+		   dns_rdataset_t *rrset ISC_ATTR_UNUSED) {
 	return ISC_R_EXISTS;
 }
 
@@ -1221,10 +1214,9 @@ typedef struct {
  * an RRSIG nor an NSEC3PARAM nor a NSEC.
  */
 static bool
-type_not_soa_nor_ns_p(dns_zone_t *zone, dns_rdata_t *update_rr,
+type_not_soa_nor_ns_p(dns_zone_t *zone ISC_ATTR_UNUSED,
+		      dns_rdata_t *update_rr ISC_ATTR_UNUSED,
 		      dns_rdata_t *db_rr) {
-	UNUSED(zone);
-	UNUSED(update_rr);
 	return (db_rr->type != dns_rdatatype_soa &&
 		db_rr->type != dns_rdatatype_ns &&
 		db_rr->type != dns_rdatatype_nsec3param &&
@@ -1238,9 +1230,8 @@ type_not_soa_nor_ns_p(dns_zone_t *zone, dns_rdata_t *update_rr,
  * Return true iff 'db_rr' is neither a RRSIG nor a NSEC.
  */
 static bool
-type_not_dnssec(dns_zone_t *zone, dns_rdata_t *update_rr, dns_rdata_t *db_rr) {
-	UNUSED(zone);
-	UNUSED(update_rr);
+type_not_dnssec(dns_zone_t *zone ISC_ATTR_UNUSED,
+		dns_rdata_t *update_rr ISC_ATTR_UNUSED, dns_rdata_t *db_rr) {
 	return (db_rr->type != dns_rdatatype_rrsig &&
 		db_rr->type != dns_rdatatype_nsec)
 		       ? true
@@ -1251,10 +1242,8 @@ type_not_dnssec(dns_zone_t *zone, dns_rdata_t *update_rr, dns_rdata_t *db_rr) {
  * Return true always.
  */
 static bool
-true_p(dns_zone_t *zone, dns_rdata_t *update_rr, dns_rdata_t *db_rr) {
-	UNUSED(zone);
-	UNUSED(update_rr);
-	UNUSED(db_rr);
+true_p(dns_zone_t *zone ISC_ATTR_UNUSED, dns_rdata_t *update_rr ISC_ATTR_UNUSED,
+       dns_rdata_t *db_rr ISC_ATTR_UNUSED) {
 	return true;
 }
 
@@ -1263,13 +1252,11 @@ true_p(dns_zone_t *zone, dns_rdata_t *update_rr, dns_rdata_t *db_rr) {
  * of a key that is being used for signing.
  */
 static bool
-rr_not_dnskey_inuse(dns_zone_t *zone, dns_rdata_t *update_rr,
+rr_not_dnskey_inuse(dns_zone_t *zone, dns_rdata_t *update_rr ISC_ATTR_UNUSED,
 		    dns_rdata_t *db_rr) {
 	isc_result_t result;
 	bool dnskey_inuse = false;
 
-	UNUSED(update_rr);
-
 	if (dns_rdatatype_iskeymaterial(db_rr->type)) {
 		/*
 		 * If the check fails, we couldn't convert the rdata into a
@@ -1299,8 +1286,8 @@ cleanup:
  * Return true iff the two RRs have identical rdata.
  */
 static bool
-rr_equal_p(dns_zone_t *zone, dns_rdata_t *update_rr, dns_rdata_t *db_rr) {
-	UNUSED(zone);
+rr_equal_p(dns_zone_t *zone ISC_ATTR_UNUSED, dns_rdata_t *update_rr,
+	   dns_rdata_t *db_rr) {
 	/*
 	 * XXXRTH  This is not a problem, but we should consider creating
 	 *         dns_rdata_equal() (that used dns_name_equal()), since it
@@ -1322,12 +1309,11 @@ rr_equal_p(dns_zone_t *zone, dns_rdata_t *update_rr, dns_rdata_t *db_rr) {
  * rollover by only requiring that the new RRSIG be added.
  */
 static bool
-replaces_p(dns_zone_t *zone, dns_rdata_t *update_rr, dns_rdata_t *db_rr) {
+replaces_p(dns_zone_t *zone ISC_ATTR_UNUSED, dns_rdata_t *update_rr,
+	   dns_rdata_t *db_rr) {
 	dns_rdata_rrsig_t updatesig, dbsig;
 	isc_result_t result;
 
-	UNUSED(zone);
-
 	if (db_rr->type != update_rr->type) {
 		return false;
 	}