From 99f627f2a9b60bb1df3de6b4030578baaa87d76a Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Wed, 15 Nov 2000 23:40:00 +0000 Subject: [PATCH] In dns_opt_attrtotext(), declare and set omit_final_dot only when DNS_OPT_NEWCODES is defined. In dns_opt_totext(), do not declare or set omit_final_dot at all. --- lib/dns/opt.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/dns/opt.c b/lib/dns/opt.c index dc74f63aae..727f48ac6e 100644 --- a/lib/dns/opt.c +++ b/lib/dns/opt.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: opt.c,v 1.6 2000/11/14 23:29:52 bwelling Exp $ */ +/* $Id: opt.c,v 1.7 2000/11/15 23:40:00 tale Exp $ */ #include @@ -151,17 +151,18 @@ dns_opt_attrtotext(dns_optattr_t *attr, isc_buffer_t *target, dns_messagetextflag_t flags) { isc_result_t result = ISC_R_SUCCESS; char store[sizeof("012345678")]; - isc_boolean_t omit_final_dot; #ifdef DNS_OPT_NEWCODES + isc_boolean_t omit_final_dot; dns_decompress_t dctx; dns_fixedname_t fname; isc_buffer_t source; + omit_final_dot = ISC_TF((flags & DNS_MESSAGETEXTFLAG_OMITDOT) != 0); + #else /* DNS_OPT_NEWCODES */ UNUSED (flags); #endif /* DNS_OPT_NEWCODES */ - omit_final_dot = ISC_TF((flags & DNS_MESSAGETEXTFLAG_OMITDOT) != 0); switch (attr->code) { #ifdef DNS_OPT_NEWCODES case DNS_OPTCODE_ZONE: @@ -214,15 +215,12 @@ dns_opt_totext(dns_rdataset_t *opt, isc_buffer_t *target, dns_messagetextflag_t flags) { isc_result_t result, iresult; char buf[sizeof("1234567890")]; - isc_boolean_t omit_final_dot; dns_optattr_t attr; dns_optlist_t list; REQUIRE(DNS_RDATASET_VALID(opt)); REQUIRE(target != NULL); - omit_final_dot = ISC_TF((flags & DNS_MESSAGETEXTFLAG_OMITDOT) != 0); - if ((flags & DNS_MESSAGETEXTFLAG_NOCOMMENTS) == 0) ADD_STRING(target, ";; OPT PSEUDOSECTION:\n", fail); ADD_STRING(target, "; EDNS: version: ", fail);