]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
resolved: llmnr, mdns: simplify error handling
authorDaniel Mack <daniel@zonque.org>
Wed, 9 Dec 2015 09:24:27 +0000 (10:24 +0100)
committerDaniel Mack <daniel@zonque.org>
Wed, 9 Dec 2015 17:49:15 +0000 (18:49 +0100)
sd_event_add_io() returns the error directly and does not mess with errno.

src/resolve/resolved-llmnr.c
src/resolve/resolved-mdns.c

index 6a7ff9d24589329ce5d85d811502dce74d7907fa..ed754c38996d32c16a5fe8c5f9168ed4d96d844f 100644 (file)
@@ -461,10 +461,8 @@ int manager_llmnr_ipv6_tcp_fd(Manager *m) {
         }
 
         r = sd_event_add_io(m->event, &m->llmnr_ipv6_tcp_event_source, m->llmnr_ipv6_tcp_fd, EPOLLIN, on_llmnr_stream, m);
-        if (r < 0)  {
-                r = -errno;
+        if (r < 0)
                 goto fail;
-        }
 
         return m->llmnr_ipv6_tcp_fd;
 
index 096a4b1fe55a7157663df69a2c703079621684c0..abe63d58c1d86cc4abd2ba7ccc86b05916a0ab8d 100644 (file)
@@ -275,10 +275,8 @@ int manager_mdns_ipv6_fd(Manager *m) {
         }
 
         r = sd_event_add_io(m->event, &m->mdns_ipv6_event_source, m->mdns_ipv6_fd, EPOLLIN, on_mdns_packet, m);
-        if (r < 0)  {
-                r = -errno;
+        if (r < 0)
                 goto fail;
-        }
 
         return m->mdns_ipv6_fd;