From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 18 Jun 2021 06:29:07 +0000 (+0900)
Subject: arp-util: shorten code a bit
X-Git-Tag: v249-rc3~17^2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28ba416c99d04b46a31ff707d8cd5291e1ec5eae;p=thirdparty%2Fsystemd.git

arp-util: shorten code a bit
---

diff --git a/src/libsystemd-network/arp-util.c b/src/libsystemd-network/arp-util.c
index 9786fccfbd0..251a7a7989e 100644
--- a/src/libsystemd-network/arp-util.c
+++ b/src/libsystemd-network/arp-util.c
@@ -73,7 +73,6 @@ int arp_network_bind_raw_socket(int ifindex, be32_t address, const struct ether_
                 .ll.sll_addr     = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
         };
         _cleanup_close_ int s = -1;
-        int r;
 
         assert(ifindex > 0);
 
@@ -81,12 +80,10 @@ int arp_network_bind_raw_socket(int ifindex, be32_t address, const struct ether_
         if (s < 0)
                 return -errno;
 
-        r = setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER, &fprog, sizeof(fprog));
-        if (r < 0)
+        if (setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER, &fprog, sizeof(fprog)) < 0)
                 return -errno;
 
-        r = bind(s, &link.sa, sizeof(link.ll));
-        if (r < 0)
+        if (bind(s, &link.sa, sizeof(link.ll)) < 0)
                 return -errno;
 
         return TAKE_FD(s);