From e5ef038134904853f9cebc3b409c68cf1bb56aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Tue, 10 Jul 2018 14:34:35 +0200 Subject: [PATCH] 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. --- bin/dig/dighost.c | 9 ++------- lib/dns/include/dns/name.h | 3 +-- lib/dns/name.c | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index 4865ac7e94..30d5231375 100644 --- 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 ea6d772361..74d114e1ef 100644 --- 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 5dc3e35e6f..75225f3ee3 100644 --- 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); }