X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve%2Fresolved-bus.c;h=f486fcdbcc3d99d3af136202be098f1233234d92;hb=3c0cf502796be355431d4a64d738e75f543aa51d;hp=642332790cf8ba58cf4d47f5f2cc9177592d9836;hpb=322345fdb9865ef2477fba8e4bdde0e1183ef505;p=elogind.git

diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
index 642332790..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)
@@ -392,7 +388,6 @@ finish:
 
 static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
         _cleanup_(dns_resource_key_free) DnsResourceKey key = {};
-        _cleanup_free_ char *ip = NULL;
         Manager *m = userdata;
         uint8_t family;
         const void *d;