Rename dns_zone_forcereload() to dns_zone_forcexfr()

The new name describes the function more accurately.

diff --git a/bin/named/server.c b/bin/named/server.c
index acba8704730000a6f3bfafe3038a11cc65eefd01..ce8a0ae3c983f6cadbcfa6c470ec63d0388a9b89 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -10834,7 +10834,7 @@ named_server_retransfercommand(named_server_t *server, isc_lex_t *lex,
                if (force) {
                        dns_zone_stopxfr(zone);
                }
-               dns_zone_forcereload(zone);
+               dns_zone_forcexfr(zone);
        } else {
                (void)putstr(text, "retransfer: inappropriate zone type: ");
                (void)putstr(text, dns_zonetype_name(type));

diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index d6d9a0e6914672d7262ce4c7757988af7af7263e..a394ddd72e034e5b62f261452c1214975372dcf2 100644 (file)
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -2007,9 +2007,9 @@ dns_zone_stopxfr(dns_zone_t *zone);
  */
 
 void
-dns_zone_forcereload(dns_zone_t *zone);
+dns_zone_forcexfr(dns_zone_t *zone);
 /*%<
- *      Force a reload of specified zone.
+ *      Force a zone transfer of the specified zone.
  *
  * Requires:
  *\li      'zone' to be a valid zone.

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 037040054800f992759a77a6c769bcc9a743b002..0bf4b6b865a68f5d10dca0fed5421194c8884bfb 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -19495,7 +19495,7 @@ dns_zone_stopxfr(dns_zone_t *zone) {
 }
 
 void
-dns_zone_forcereload(dns_zone_t *zone) {
+dns_zone_forcexfr(dns_zone_t *zone) {
        REQUIRE(DNS_ZONE_VALID(zone));
 
        if (zone->type == dns_zone_primary ||