]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
arp-util: shorten code a bit
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 18 Jun 2021 06:29:07 +0000 (15:29 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 30 Jun 2021 15:49:02 +0000 (00:49 +0900)
src/libsystemd-network/arp-util.c

index 9786fccfbd0646895daa44c5f7735d085585dd3f..251a7a7989e6a27f19e0126a2ceb8e8e0e7dfbbf 100644 (file)
@@ -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);