From 46b806084e5426982fbf94cb8f4cf1a95ded6c54 Mon Sep 17 00:00:00 2001 From: Greg Hazel Date: Wed, 18 Apr 2012 21:41:48 -0700 Subject: [PATCH] remove redundant DNS_ERR_CANCEL check, move comment --- evdns.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/evdns.c b/evdns.c index ba010d46..5db46248 100644 --- a/evdns.c +++ b/evdns.c @@ -2251,16 +2251,15 @@ nameserver_probe_callback(int result, char type, int count, int ttl, void *addre (void) addresses; if (result == DNS_ERR_CANCEL) { + /* We canceled this request because the nameserver came up + * for some other reason. Do not change our opinion about + * the nameserver. */ return; } EVDNS_LOCK(ns->base); ns->probe_request = NULL; - if (result == DNS_ERR_CANCEL) { - /* We canceled this request because the nameserver came up - * for some other reason. Do not change our opinion about - * the nameserver. */ - } else if (result == DNS_ERR_NONE || result == DNS_ERR_NOTEXIST) { + if (result == DNS_ERR_NONE || result == DNS_ERR_NOTEXIST) { /* this is a good reply */ nameserver_up(ns); } else {