From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Dec 2015 13:29:32 +0000 (+0100)
Subject: resolved: don't check for NULL DnsAnswer object explicitly where unnecessary
X-Git-Tag: v229~201^2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1849cb7cb723e8ea7c13b967d056c1d3a36d9042;p=thirdparty%2Fsystemd.git

resolved: don't check for NULL DnsAnswer object explicitly where unnecessary

The DNS_ANSWER_FOREACH macros do this internally anyway, no need to
duplicate this.
---

diff --git a/src/resolve/resolved-dns-answer.c b/src/resolve/resolved-dns-answer.c
index 5355303bd33..727fa750679 100644
--- a/src/resolve/resolved-dns-answer.c
+++ b/src/resolve/resolved-dns-answer.c
@@ -233,9 +233,6 @@ int dns_answer_find_soa(DnsAnswer *a, const DnsResourceKey *key, DnsResourceReco
 
         assert(key);
 
-        if (!a)
-                return 0;
-
         /* For a SOA record we can never find a matching SOA record */
         if (key->type == DNS_TYPE_SOA)
                 return 0;
@@ -260,9 +257,6 @@ int dns_answer_find_cname_or_dname(DnsAnswer *a, const DnsResourceKey *key, DnsR
 
         assert(key);
 
-        if (!a)
-                return 0;
-
         /* For a {C,D}NAME record we can never find a matching {C,D}NAME record */
         if (key->type == DNS_TYPE_CNAME || key->type == DNS_TYPE_DNAME)
                 return 0;