From 6bba0663023d690a01e2fc88c724291628f20ece Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Tue, 8 Aug 2017 16:31:44 -0700 Subject: [PATCH] style --- lib/dns/resolver.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 72c48a277b..a00c395db6 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -6654,28 +6654,29 @@ resume_dslookup(isc_task_t *task, isc_event_t *event) { bucketnum = fctx->bucketnum; if (fevent->result == ISC_R_CANCELED) { - - if (dns_rdataset_isassociated(fevent->rdataset)) + if (dns_rdataset_isassociated(fevent->rdataset)) { dns_rdataset_disassociate(fevent->rdataset); + } fevent = NULL; isc_event_free(&event); dns_resolver_destroyfetch(&fctx->nsfetch); fctx_done(fctx, ISC_R_CANCELED, __LINE__); } else if (fevent->result == ISC_R_SUCCESS) { - FCTXTRACE("resuming DS lookup"); dns_resolver_destroyfetch(&fctx->nsfetch); - if (dns_rdataset_isassociated(&fctx->nameservers)) + if (dns_rdataset_isassociated(&fctx->nameservers)) { dns_rdataset_disassociate(&fctx->nameservers); + } dns_rdataset_clone(fevent->rdataset, &fctx->nameservers); fctx->ns_ttl = fctx->nameservers.ttl; fctx->ns_ttl_ok = ISC_TRUE; log_ns_ttl(fctx, "resume_dslookup"); - if (dns_rdataset_isassociated(fevent->rdataset)) + if (dns_rdataset_isassociated(fevent->rdataset)) { dns_rdataset_disassociate(fevent->rdataset); + } fevent = NULL; isc_event_free(&event); @@ -6707,9 +6708,9 @@ resume_dslookup(isc_task_t *task, isc_event_t *event) { domain = dns_fixedname_name(&fixed); dns_name_copy(&fctx->nsfetch->private->domain, domain, NULL); if (dns_name_equal(&fctx->nsname, domain)) { - - if (dns_rdataset_isassociated(fevent->rdataset)) + if (dns_rdataset_isassociated(fevent->rdataset)) { dns_rdataset_disassociate(fevent->rdataset); + } fevent = NULL; isc_event_free(&event); @@ -6749,9 +6750,9 @@ resume_dslookup(isc_task_t *task, isc_event_t *event) { * accessed below this point to prevent races with * another thread concurrently processing the fetch. */ - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS) { fctx_done(fctx, result, __LINE__); - else { + } else { LOCK(&res->buckets[bucketnum].lock); locked = ISC_TRUE; fctx->references++;