Commit c6f3949f14 for bind

commit c6f3949f1416fdd037833af985e7f5913ce0c0c9
Author: Alessio Podda <alessio@isc.org>
Date:   Wed Sep 23 23:27:14 2026 +0200

    Simplify zone name formatting and NOTIFY setters

    The previous changes allow for further code simplifications to the
    NOTIFY and logging setters.

diff --git a/lib/dns/zoneproperties.c b/lib/dns/zoneproperties.c
index a55c7662de..547b7c43ca 100644
--- a/lib/dns/zoneproperties.c
+++ b/lib/dns/zoneproperties.c
@@ -32,8 +32,6 @@ static void
 default_journal(dns_zone_t *zone);
 static void
 zone_namerd_tostr(dns_zone_t *zone, char *buf, size_t length);
-static void
-zone_name_tostr(dns_zone_t *zone, char *buf, size_t length);

 static void
 free_rad_rcu(struct rcu_head *rcu_head) {
@@ -1310,11 +1308,22 @@ zone_namerd_tostr(dns_zone_t *zone, char *buf, size_t length) {
 	buf[isc_buffer_usedlength(&buffer)] = '\0';
 }

-static void
-zone_name_tostr(dns_zone_t *zone, char *buf, size_t length) {
+void
+dns_zone_name(dns_zone_t *zone, char *buf, size_t length) {
+	REQUIRE(DNS_ZONE_VALID(zone));
+	REQUIRE(buf != NULL);
+
+	LOCK_ZONE(zone);
+	zone_namerd_tostr(zone, buf, length);
+	UNLOCK_ZONE(zone);
+}
+
+void
+dns_zone_nameonly(dns_zone_t *zone, char *buf, size_t length) {
 	isc_result_t result = ISC_R_FAILURE;
 	isc_buffer_t buffer;

+	REQUIRE(DNS_ZONE_VALID(zone));
 	REQUIRE(buf != NULL);
 	REQUIRE(length > 1U);

@@ -1335,23 +1344,6 @@ zone_name_tostr(dns_zone_t *zone, char *buf, size_t length) {
 	buf[isc_buffer_usedlength(&buffer)] = '\0';
 }

-void
-dns_zone_name(dns_zone_t *zone, char *buf, size_t length) {
-	REQUIRE(DNS_ZONE_VALID(zone));
-	REQUIRE(buf != NULL);
-
-	LOCK_ZONE(zone);
-	zone_namerd_tostr(zone, buf, length);
-	UNLOCK_ZONE(zone);
-}
-
-void
-dns_zone_nameonly(dns_zone_t *zone, char *buf, size_t length) {
-	REQUIRE(DNS_ZONE_VALID(zone));
-	REQUIRE(buf != NULL);
-	zone_name_tostr(zone, buf, length);
-}
-
 void
 dns_zone_setminxfrratein(dns_zone_t *zone, uint32_t bytes, uint32_t seconds) {
 	REQUIRE(DNS_ZONE_VALID(zone));
@@ -1740,7 +1732,7 @@ dns_zone_setnotifydefer(dns_zone_t *zone, dns_rdatatype_t type,
 		zone->notifysoa.notifydefer = defer;
 		break;
 	case dns_rdatatype_cds:
-		/* not applicable to NOTIFY(CDS), unused */
+		/* Not applicable to NOTIFY(CDS), unused. */
 		zone->notifycds.notifydefer = defer;
 		break;
 	default:
@@ -1760,7 +1752,7 @@ dns_zone_setnotifydelay(dns_zone_t *zone, dns_rdatatype_t type,
 		zone->notifysoa.notifydelay = delay;
 		break;
 	case dns_rdatatype_cds:
-		/* not applicable to NOTIFY(CDS), unused */
+		/* Not applicable to NOTIFY(CDS), unused. */
 		zone->notifycds.notifydelay = delay;
 		break;
 	default: