From 9886b6b13cfe4348f9bd2ab62bb1d821fdac7ab7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 4 Oct 2017 11:57:10 +0200 Subject: [PATCH] resolved: take benefit of log_xyz_errno() returning the negative error code Just some modernizations. --- src/resolve/resolved-mdns.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/resolve/resolved-mdns.c b/src/resolve/resolved-mdns.c index 415dc1a532..6fbf755878 100644 --- a/src/resolve/resolved-mdns.c +++ b/src/resolve/resolved-mdns.c @@ -86,27 +86,21 @@ static int mdns_scope_process_query(DnsScope *s, DnsPacket *p) { key = p->question->keys[0]; r = dns_zone_lookup(&s->zone, key, 0, &answer, &soa, &tentative); - if (r < 0) { - log_debug_errno(r, "Failed to lookup key: %m"); - return r; - } + if (r < 0) + return log_debug_errno(r, "Failed to lookup key: %m"); if (r == 0) return 0; r = dns_scope_make_reply_packet(s, DNS_PACKET_ID(p), DNS_RCODE_SUCCESS, NULL, answer, NULL, false, &reply); - if (r < 0) { - log_debug_errno(r, "Failed to build reply packet: %m"); - return r; - } + if (r < 0) + return log_debug_errno(r, "Failed to build reply packet: %m"); if (!ratelimit_test(&s->ratelimit)) return 0; r = dns_scope_emit_udp(s, -1, reply); - if (r < 0) { - log_debug_errno(r, "Failed to send reply packet: %m"); - return r; - } + if (r < 0) + return log_debug_errno(r, "Failed to send reply packet: %m"); return 0; }