From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Thu, 17 Jul 2014 19:12:39 +0000 (+0200)
Subject: resolved: silence warnings
X-Git-Tag: v216~524
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=962225baa862c2023790b3c7f140d22bac9e801f

resolved: silence warnings

No need to write to r here since it will be overwritten as the first
step in parse_fail.
---

diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
index c5e298d21..f486fcdbc 100644
--- a/src/resolve/resolved-bus.c
+++ b/src/resolve/resolved-bus.c
@@ -145,10 +145,8 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) {
         }
 
         n = dns_query_get_rrs(q, &rrs);
-        if (n < 0) {
-                r = n;
+        if (n < 0)
                 goto parse_fail;
-        }
 
         r = sd_bus_message_new_method_return(q->request, &reply);
         if (r < 0)
@@ -337,10 +335,8 @@ static void bus_method_resolve_address_complete(DnsQuery *q) {
         }
 
         n = dns_query_get_rrs(q, &rrs);
-        if (n < 0) {
-                r = n;
+        if (n < 0)
                 goto parse_fail;
-        }
 
         r = sd_bus_message_new_method_return(q->request, &reply);
         if (r < 0)