libdns refactoring: get rid of two versions of dns_byaddr_createptrname

diff --git a/bin/delv/delv.c b/bin/delv/delv.c
index c97ad69a0957e83e3266704155ad4836f2974900..100f03c6d92fef13cc3201fbf6fc815dad94e600 100644 (file)
--- a/bin/delv/delv.c
+++ b/bin/delv/delv.c
@@ -1540,7 +1540,7 @@ get_reverse(char *reverse, size_t len, char *value, isc_boolean_t strict) {
 
                dns_fixedname_init(&fname);
                name = dns_fixedname_name(&fname);
-               result = dns_byaddr_createptrname2(&addr, options, name);
+               result = dns_byaddr_createptrname(&addr, options, name);
                if (result != ISC_R_SUCCESS)
                        return (result);
                dns_name_format(name, reverse, (unsigned int)len);

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 7654451c509324aeab239eac2296d0a4ead18b12..8d865327f874fd93a8d5f33ef094d4da991c0f1f 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -355,7 +355,7 @@ get_reverse(char *reverse, size_t len, char *value, isc_boolean_t ip6_int,
                        options |= DNS_BYADDROPT_IPV6INT;
                dns_fixedname_init(&fname);
                name = dns_fixedname_name(&fname);
-               result = dns_byaddr_createptrname2(&addr, options, name);
+               result = dns_byaddr_createptrname(&addr, options, name);
                if (result != ISC_R_SUCCESS)
                        return (result);
                dns_name_format(name, reverse, (unsigned int)len);

diff --git a/bin/tests/system/dyndb/driver/syncptr.c b/bin/tests/system/dyndb/driver/syncptr.c
index 7ca2d3f2794b32d16bad6f8d93d39bc569f86e15..17a61300616a1216188428a6cda32caec4c22a3a 100644 (file)
--- a/bin/tests/system/dyndb/driver/syncptr.c
+++ b/bin/tests/system/dyndb/driver/syncptr.c
@@ -119,7 +119,7 @@ syncptr_find_zone(sample_instance_t *inst, dns_rdata_t *rdata,
         * @example
         * 192.168.0.1 -> 1.0.168.192.in-addr.arpa
         */
-       CHECK(dns_byaddr_createptrname2(&isc_ip, 0, name));
+       CHECK(dns_byaddr_createptrname(&isc_ip, 0, name));
 
        /* Find a zone containing owner name of the PTR record. */
        result = dns_zt_find(inst->view->zonetable, name, 0, NULL, zone);

diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index e590e3aa6ef316a1dbf8809efe40039dfa8a9b63..cc21f74089b175d373a259bcbbe85abf08b3ecc1 100644 (file)
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -1004,7 +1004,7 @@ get_reverse(char *reverse, size_t len, const char *value,
                        options |= DNS_BYADDROPT_IPV6INT;
                dns_fixedname_init(&fname);
                name = dns_fixedname_name(&fname);
-               result = dns_byaddr_createptrname2(&addr, options, name);
+               result = dns_byaddr_createptrname(&addr, options, name);
                CHECK("dns_byaddr_createptrname2", result);
                dns_name_format(name, reverse, (unsigned int)len);
                return;

diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c
index c1fb585931c831a794c2b20456be36ee7f2d30b4..bdfa8cdb4f4b0e8f77646f6c7afc4e359e01830b 100644 (file)
--- a/lib/dns/byaddr.c
+++ b/lib/dns/byaddr.c
@@ -43,21 +43,8 @@ static char hex_digits[] = {
 };
 
 isc_result_t
-dns_byaddr_createptrname(const isc_netaddr_t *address, isc_boolean_t nibble,
+dns_byaddr_createptrname(const isc_netaddr_t *address, unsigned int options,
                         dns_name_t *name)
-{
-       /*
-        * We dropped bitstring labels, so all lookups will use nibbles.
-        */
-       UNUSED(nibble);
-
-       return (dns_byaddr_createptrname2(address,
-                                         DNS_BYADDROPT_IPV6INT, name));
-}
-
-isc_result_t
-dns_byaddr_createptrname2(const isc_netaddr_t *address, unsigned int options,
-                         dns_name_t *name)
 {
        char textname[128];
        const unsigned char *bytes;
@@ -245,8 +232,8 @@ dns_byaddr_create(isc_mem_t *mctx, const isc_netaddr_t *address,
 
        dns_fixedname_init(&byaddr->name);
 
-       result = dns_byaddr_createptrname2(address, options,
-                                          dns_fixedname_name(&byaddr->name));
+       result = dns_byaddr_createptrname(address, options,
+                                         dns_fixedname_name(&byaddr->name));
        if (result != ISC_R_SUCCESS)
                goto cleanup_lock;
 

diff --git a/lib/dns/include/dns/byaddr.h b/lib/dns/include/dns/byaddr.h
index 296093ce10729a7bb6732c5b4234e04577388236..1cf49c8190ad9371758f283460b453219459a2aa 100644 (file)
--- a/lib/dns/include/dns/byaddr.h
+++ b/lib/dns/include/dns/byaddr.h
@@ -141,12 +141,8 @@ dns_byaddr_destroy(dns_byaddr_t **byaddrp);
  */
 
 isc_result_t
-dns_byaddr_createptrname(const isc_netaddr_t *address, isc_boolean_t nibble,
+dns_byaddr_createptrname(const isc_netaddr_t *address, unsigned int options,
                         dns_name_t *name);
-
-isc_result_t
-dns_byaddr_createptrname2(const isc_netaddr_t *address, unsigned int options,
-                         dns_name_t *name);
 /*%<
  * Creates a name that would be used in a PTR query for this address.  The
  * nibble flag indicates that the 'nibble' format is to be used if an IPv6

diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in
index 7b8e883192dba028e58d8385620050bde0a2bfc3..8b4f811b7a275201bc597f241ac0cc69688b2497 100644 (file)
--- a/lib/dns/win32/libdns.def.in
+++ b/lib/dns/win32/libdns.def.in
@@ -68,7 +68,6 @@ dns_badcache_print
 dns_byaddr_cancel
 dns_byaddr_create
 dns_byaddr_createptrname
-dns_byaddr_createptrname2
 dns_byaddr_destroy
 dns_cache_attach
 dns_cache_attachdb

diff --git a/lib/irs/getnameinfo.c b/lib/irs/getnameinfo.c
index f81f93f319c111df7e931265038e63607292f8c5..e3340af926c49682c7cf796f16cf6c24684b5df4 100644 (file)
--- a/lib/irs/getnameinfo.c
+++ b/lib/irs/getnameinfo.c
@@ -292,7 +292,7 @@ getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen,
                isc_netaddr_fromsockaddr(&netaddr, (const isc_sockaddr_t *)sa);
                dns_fixedname_init(&ptrfname);
                ptrname = dns_fixedname_name(&ptrfname);
-               iresult = dns_byaddr_createptrname2(&netaddr, 0, ptrname);
+               iresult = dns_byaddr_createptrname(&netaddr, 0, ptrname);
                if (iresult != ISC_R_SUCCESS)
                        ERR(EAI_FAIL);