From: Mark Andrews Date: Thu, 4 Mar 2021 01:35:11 +0000 (+1100) Subject: Remove dns_zone_setflag() X-Git-Tag: v9.17.14~45^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=314b5362a8161a42c08906149f1e3187d0f1ad83;p=thirdparty%2Fbind9.git Remove dns_zone_setflag() This function has never been used since it was added to the source tree by commit 686b27bfd3ef906721fad485e3dae759679890b7 back in 1999. As the dns_zoneflg_t type is only defined in lib/dns/zone.c, no function external to that file would be able to use dns_zone_setflag() properly anyway - the DNS_ZONE_SETFLAG() and DNS_ZONE_CLRFLAG() macros should be used instead. Zone options that can be set from outside zone.c are set using dns_zone_setoption(). --- diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h index 3acb5a19835..de9ffda6206 100644 --- a/lib/dns/include/dns/zone.h +++ b/lib/dns/include/dns/zone.h @@ -468,16 +468,6 @@ dns_zone_idetach(dns_zone_t **zonep); *\li 'zonep' to point to a valid zone. */ -void -dns_zone_setflag(dns_zone_t *zone, unsigned int flags, bool value); -/*%< - * Sets ('value' == 'true') / clears ('value' == 'IS_FALSE') - * zone flags. Valid flag bits are DNS_ZONE_F_*. - * - * Requires - *\li 'zone' to be a valid zone. - */ - isc_result_t dns_zone_getdb(dns_zone_t *zone, dns_db_t **dbp); /*%< diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in index 145d47883ef..2a702765fc4 100644 --- a/lib/dns/win32/libdns.def.in +++ b/lib/dns/win32/libdns.def.in @@ -1310,7 +1310,6 @@ dns_zone_setdbtype dns_zone_setdialup dns_zone_setdnssecsignstats dns_zone_setfile -dns_zone_setflag dns_zone_setforwardacl dns_zone_setidlein dns_zone_setidleout diff --git a/lib/dns/zone.c b/lib/dns/zone.c index c0d69c76aa3..f621e15898a 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -5704,17 +5704,6 @@ dns_zone_getmgr(dns_zone_t *zone) { return (zone->zmgr); } -void -dns_zone_setflag(dns_zone_t *zone, unsigned int flags, bool value) { - REQUIRE(DNS_ZONE_VALID(zone)); - - if (value) { - DNS_ZONE_SETFLAG(zone, flags); - } else { - DNS_ZONE_CLRFLAG(zone, flags); - } -} - void dns_zone_setkasp(dns_zone_t *zone, dns_kasp_t *kasp) { REQUIRE(DNS_ZONE_VALID(zone));