upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-15 02:10:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove redundant dns_name_totextfilter_t argument

Browse source 
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.
This commit is contained in:
Michał Kępień 2018-07-10 14:34:35 +02:00
parent 19c42d46e8
commit e5ef038134
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/dig/dighost.c
View file

@ -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.
*/

3
lib/dns/include/dns/name.h
View file

@ -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

2
lib/dns/name.c
View file

@ -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);
}