Remove redundant dns_name_totextfilter_t argument

Since idn_output_filter() no longer uses its 'absolute' argument and no
other callback is used with dns_name_settotextfilter(), remove the
'absolute' argument from the dns_name_totextfilter_t prototype.

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 4865ac7e947adbfeb4e05287dd5527d876fa3375..30d523137520d9b8fed171b995864ee17cb1a095 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -136,8 +136,7 @@ static char servercookie[256];
 static void idn_locale_to_ace(const char *src, char *dst, size_t dstlen);
 static void idn_ace_to_locale(const char *src, char **dst);
 static isc_result_t idn_output_filter(isc_buffer_t *buffer,
-                                     unsigned int used_org,
-                                     isc_boolean_t absolute);
+                                     unsigned int used_org);
 #endif /* HAVE_LIBIDN2 */
 
 isc_socket_t *keep = NULL;
@@ -4194,14 +4193,10 @@ destroy_libs(void) {
 
 #ifdef HAVE_LIBIDN2
 static isc_result_t
-idn_output_filter(isc_buffer_t *buffer, unsigned int used_org,
-                 isc_boolean_t absolute)
-{
+idn_output_filter(isc_buffer_t *buffer, unsigned int used_org) {
        char src[MXNAME], *dst;
        size_t srclen, dstlen;
 
-       UNUSED(absolute);
-
        /*
         * Copy name from 'buffer' to 'src' and terminate it with NULL.
         */

diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index ea6d772361fb50626226294601e9b4a4761d6778..74d114e1ef2c9e3679077151cb478108267ec2fb 100644 (file)
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -192,8 +192,7 @@ LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_wildcardname;
  * is from 'buffer'->base + 'used_org' to the end of the used region.
  */
 typedef isc_result_t (*dns_name_totextfilter_t)(isc_buffer_t *target,
-                                               unsigned int used_org,
-                                               isc_boolean_t absolute);
+                                               unsigned int used_org);
 
 /***
  *** Initialization

diff --git a/lib/dns/name.c b/lib/dns/name.c
index 5dc3e35e6f46d01b69cd0666b736d531513ebb88..75225f3ee35a3b0a96bc575a1eaa79e6319c30ab 100644 (file)
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -1517,7 +1517,7 @@ dns_name_totext2(const dns_name_t *name, unsigned int options,
                totext_filter_proc = *mem;
 #endif
        if (totext_filter_proc != NULL)
-               return ((*totext_filter_proc)(target, oused, saw_root));
+               return ((*totext_filter_proc)(target, oused));
 
        return (ISC_R_SUCCESS);
 }