From: Matthijs Mekking <matthijs@isc.org>
Date: Thu, 19 Mar 2026 15:19:11 +0000 (+0100)
Subject: Remove unneccesary functions
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f04590d006381cca91cb1b8005769b0a6bcae011;p=thirdparty%2Fbind9.git

Remove unneccesary functions

Remove dns_zone_getmem() (duplicate of dns_zone_getmctx()).
Remove dns_zone_getrdclass() (duplicate of dns_zone_getclass()).
Remove obsoleted dns_zone_getstatscounters().
Remove obsoleted dns_zone_setstatistics().
---

diff --git a/bin/named/server.c b/bin/named/server.c
index 421d01982cd..d594d7dc6ec 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -6282,7 +6282,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
 	if (inline_signing) {
 		dns_zone_getraw(zone, &raw);
 		if (raw == NULL) {
-			dns_zone_create(&raw, dns_zone_getmem(zone),
+			dns_zone_create(&raw, dns_zone_getmctx(zone),
 					dns_zone_gettid(zone));
 			dns_zone_setorigin(raw, origin);
 			dns_zone_setview(raw, view);
diff --git a/lib/dns/include/dns/zoneproperties.h b/lib/dns/include/dns/zoneproperties.h
index 28636b75416..dcfeafa8fc5 100644
--- a/lib/dns/include/dns/zoneproperties.h
+++ b/lib/dns/include/dns/zoneproperties.h
@@ -95,15 +95,6 @@ dns_zone_getorigin(dns_zone_t *zone);
  *\li	'zone' to be a valid zone.
  */
 
-dns_rdataclass_t
-dns_zone_getrdclass(dns_zone_t *zone);
-/*%<
- *	Returns the value of the rdclass.
- *
- * Require:
- *\li	'zone' to be a valid zone.
- */
-
 void
 dns_zone_setfile(dns_zone_t *zone, const char *file, const char *initial_file,
 		 dns_masterformat_t format, const dns_master_style_t *style);
@@ -1078,18 +1069,6 @@ dns_zone_getkeydirectory(dns_zone_t *zone);
  *	Pointer to null-terminated file name, or NULL.
  */
 
-isc_result_t
-dns_zone_setstatistics(dns_zone_t *zone, bool on);
-/*%<
- * This function is obsoleted by dns_zone_setrequeststats().
- */
-
-uint64_t *
-dns_zone_getstatscounters(dns_zone_t *zone);
-/*%<
- * This function is obsoleted by dns_zone_getrequeststats().
- */
-
 void
 dns_zone_setstats(dns_zone_t *zone, isc_stats_t *stats);
 /*%<
@@ -1472,16 +1451,6 @@ dns_zone_getstatlevel(dns_zone_t *zone);
  * full, terse, or none.
  */
 
-isc_mem_t *
-dns_zone_getmem(dns_zone_t *zone);
-/**<
- * \brief Return memory context associated with the zone.
- *
- * \param zone valid dns_zone_t object.
- *
- * \return memory context associated with the zone
- */
-
 unsigned int
 dns_zone_gettid(dns_zone_t *zone);
 /**<
diff --git a/lib/dns/notify.c b/lib/dns/notify.c
index b5e62a1199d..46766ea7115 100644
--- a/lib/dns/notify.c
+++ b/lib/dns/notify.c
@@ -216,7 +216,7 @@ notify_createmessage(dns_notify_t *notify, dns_message_t **messagep) {
 
 	message->opcode = dns_opcode_notify;
 	message->flags |= DNS_MESSAGEFLAG_AA;
-	message->rdclass = dns_zone_getrdclass(notify->zone);
+	message->rdclass = dns_zone_getclass(notify->zone);
 
 	dns_message_gettempname(message, &tempname);
 	dns_message_gettemprdataset(message, &temprdataset);
@@ -225,8 +225,7 @@ notify_createmessage(dns_notify_t *notify, dns_message_t **messagep) {
 	 * Make question.
 	 */
 	dns_name_clone(dns_zone_getorigin(notify->zone), tempname);
-	dns_rdataset_makequestion(temprdataset,
-				  dns_zone_getrdclass(notify->zone),
+	dns_rdataset_makequestion(temprdataset, dns_zone_getclass(notify->zone),
 				  dns_rdatatype_soa);
 	ISC_LIST_APPEND(tempname->list, temprdataset, link);
 	dns_message_addname(message, tempname, DNS_SECTION_QUESTION);
@@ -649,7 +648,7 @@ notify_isself(dns_notify_t *notify, isc_sockaddr_t *dst) {
 		return false;
 	}
 	isself = (isselffunc)(view, key, &src, dst,
-			      dns_zone_getrdclass(notify->zone), isselfarg);
+			      dns_zone_getclass(notify->zone), isselfarg);
 	if (key != NULL) {
 		dns_tsigkey_detach(&key);
 	}
diff --git a/lib/dns/zoneproperties.c b/lib/dns/zoneproperties.c
index f468489941a..fa5ce1ef137 100644
--- a/lib/dns/zoneproperties.c
+++ b/lib/dns/zoneproperties.c
@@ -1402,13 +1402,6 @@ dns_zone_getorigin(dns_zone_t *zone) {
 	return &zone->origin;
 }
 
-dns_rdataclass_t
-dns_zone_getrdclass(dns_zone_t *zone) {
-	REQUIRE(DNS_ZONE_VALID(zone));
-
-	return zone->rdclass;
-}
-
 void
 dns_zone_setidlein(dns_zone_t *zone, uint32_t idlein) {
 	REQUIRE(DNS_ZONE_VALID(zone));
@@ -1560,25 +1553,6 @@ dns_zone_getxfrintime(dns_zone_t *zone) {
 	return xfrintime;
 }
 
-isc_result_t
-dns_zone_setstatistics(dns_zone_t *zone, bool on) {
-	/*
-	 * This function is obsoleted.
-	 */
-	UNUSED(zone);
-	UNUSED(on);
-	return ISC_R_NOTIMPLEMENTED;
-}
-
-uint64_t *
-dns_zone_getstatscounters(dns_zone_t *zone) {
-	/*
-	 * This function is obsoleted.
-	 */
-	UNUSED(zone);
-	return NULL;
-}
-
 void
 dns_zone_setstats(dns_zone_t *zone, isc_stats_t *stats) {
 	REQUIRE(DNS_ZONE_VALID(zone));
@@ -1991,11 +1965,6 @@ dns_zone_getstatlevel(dns_zone_t *zone) {
 	return zone->statlevel;
 }
 
-isc_mem_t *
-dns_zone_getmem(dns_zone_t *zone) {
-	return zone->mctx;
-}
-
 unsigned int
 dns_zone_gettid(dns_zone_t *zone) {
 	return zone->tid;