[systemd-commits] src/resolve

Thomas H.P. Andersen phomes at kemper.freedesktop.org
Thu Jul 17 12:13:31 PDT 2014


 src/resolve/resolved-bus.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 962225baa862c2023790b3c7f140d22bac9e801f
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Thu Jul 17 21:12:39 2014 +0200

    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 c5e298d..f486fcd 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)



More information about the systemd-commits mailing list