]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
resolved: simplify on_stream_io() a bit
authorLennart Poettering <lennart@poettering.net>
Tue, 4 Dec 2018 18:13:55 +0000 (19:13 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 7 Dec 2018 16:16:29 +0000 (17:16 +0100)
src/resolve/resolved-dns-stream.c

index 26d4663d746f38999575346e897899543cd6de7f..8964a8636aa491210f70261b5f58e1bc936125d7 100644 (file)
@@ -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