From b2cf6704e724ad9bb2912adab8a222ba130d2103 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 4 Dec 2018 19:13:55 +0100 Subject: [PATCH] resolved: simplify on_stream_io() a bit --- src/resolve/resolved-dns-stream.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c index 26d4663d746..8964a8636aa 100644 --- a/src/resolve/resolved-dns-stream.c +++ b/src/resolve/resolved-dns-stream.c @@ -281,18 +281,16 @@ static int on_stream_io(sd_event_source *es, int fd, uint32_t revents, void *use #if ENABLE_DNS_OVER_TLS if (s->encrypted) { r = dnstls_stream_on_io(s, revents); - if (r == DNSTLS_STREAM_CLOSED) return 0; - else if (r == -EAGAIN) + if (r == -EAGAIN) return dns_stream_update_io(s); - else if (r < 0) { + if (r < 0) return dns_stream_complete(s, -r); - } else { - r = dns_stream_update_io(s); - if (r < 0) - return r; - } + + r = dns_stream_update_io(s); + if (r < 0) + return r; } #endif -- 2.47.3