diff options
| author | 2020-02-24 16:11:20 +0000 | |
|---|---|---|
| committer | 2020-02-24 16:11:20 +0000 | |
| commit | 13eb980b8855a33aa3111aae60e30adae3b95f3c (patch) | |
| tree | 3c8aba03c49d53f6f78b081186654b39f89b125c | |
| parent | Fix typo (diff) | |
| download | wireguard-openbsd-13eb980b8855a33aa3111aae60e30adae3b95f3c.tar.xz wireguard-openbsd-13eb980b8855a33aa3111aae60e30adae3b95f3c.zip | |
totext_filter_proc is always null, remove.
| -rw-r--r-- | usr.bin/dig/lib/dns/include/dns/name.h | 12 | ||||
| -rw-r--r-- | usr.bin/dig/lib/dns/name.c | 11 |
2 files changed, 2 insertions, 21 deletions
diff --git a/usr.bin/dig/lib/dns/include/dns/name.h b/usr.bin/dig/lib/dns/include/dns/name.h index a9868bddbb5..8e5904e4fe8 100644 --- a/usr.bin/dig/lib/dns/include/dns/name.h +++ b/usr.bin/dig/lib/dns/include/dns/name.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: name.h,v 1.9 2020/02/24 15:09:14 jsg Exp $ */ +/* $Id: name.h,v 1.10 2020/02/24 16:11:21 florian Exp $ */ #ifndef DNS_NAME_H #define DNS_NAME_H 1 @@ -142,22 +142,12 @@ struct dns_name { #define DNS_NAME_CHECKMXFAIL 0x0020 /*%< Used by rdata. */ extern dns_name_t *dns_rootname; -extern dns_name_t *dns_wildcardname; /*% * Standard size of a wire format name */ #define DNS_NAME_MAXWIRE 255 -/* - * Text output filter procedure. - * 'target' is the buffer to be converted. The region to be converted - * 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); - /*** *** Initialization ***/ diff --git a/usr.bin/dig/lib/dns/name.c b/usr.bin/dig/lib/dns/name.c index 18d267f136a..2a620bc3f20 100644 --- a/usr.bin/dig/lib/dns/name.c +++ b/usr.bin/dig/lib/dns/name.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: name.c,v 1.11 2020/02/24 15:09:14 jsg Exp $ */ +/* $Id: name.c,v 1.12 2020/02/24 16:11:20 florian Exp $ */ /*! \file */ #include <ctype.h> @@ -150,11 +150,6 @@ static dns_name_t root = DNS_NAME_INITABSOLUTE(root_ndata, root_offsets); /* XXXDCL make const? */ dns_name_t *dns_rootname = &root; -/* - * dns_name_t to text post-conversion procedure. - */ -static dns_name_totextfilter_t totext_filter_proc = NULL; - static void set_offsets(const dns_name_t *name, unsigned char *offsets, dns_name_t *set_name); @@ -948,7 +943,6 @@ dns_name_totext2(dns_name_t *name, unsigned int options, isc_buffer_t *target) unsigned int trem, count; unsigned int labels; isc_boolean_t saw_root = ISC_FALSE; - unsigned int oused = target->used; isc_boolean_t omit_final_dot = ISC_TF(options & DNS_NAME_OMITFINALDOT); @@ -1092,9 +1086,6 @@ dns_name_totext2(dns_name_t *name, unsigned int options, isc_buffer_t *target) isc_buffer_add(target, tlen - trem); - if (totext_filter_proc != NULL) - return ((*totext_filter_proc)(target, oused, saw_root)); - return (ISC_R_SUCCESS); } |
