X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fresolve%2Fresolved-dns-scope.c;h=1ce2bb4366a98bb0c14c76d2bdd943b8a79c1901;hp=a3631f08a80248baffd1a691d99e9141cbbbd294;hb=f647962d64e844689f3e2acfce6102fc47e76df2;hpb=e80733be33e52d8ab2f1ae845326d39c600f5612 diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c index a3631f08a..1ce2bb436 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/resolve/resolved-dns-scope.c @@ -721,10 +721,8 @@ int dns_scope_notify_conflict(DnsScope *scope, DnsResourceRecord *rr) { r = ordered_hashmap_put(scope->conflict_queue, rr->key, rr); if (r == -EEXIST || r == 0) return 0; - if (r < 0) { - log_debug_errno(r, "Failed to queue conflicting RR: %m"); - return r; - } + if (r < 0) + return log_debug_errno(r, "Failed to queue conflicting RR: %m"); dns_resource_record_ref(rr); @@ -740,10 +738,8 @@ int dns_scope_notify_conflict(DnsScope *scope, DnsResourceRecord *rr) { now(clock_boottime_or_monotonic()) + jitter, LLMNR_JITTER_INTERVAL_USEC, on_conflict_dispatch, scope); - if (r < 0) { - log_debug_errno(r, "Failed to add conflict dispatch event: %m"); - return r; - } + if (r < 0) + return log_debug_errno(r, "Failed to add conflict dispatch event: %m"); return 0; }