summaryrefslogtreecommitdiff
path: root/src/libsystemd-network/arp-util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-03-22 17:04:29 +0100
committerLennart Poettering <lennart@poettering.net>2018-03-22 20:30:40 +0100
commitc10d6bdb891881f68471dabd8100ea6021e6cdbb (patch)
tree99f77908217b88a1b49c1ef23d1e27c493ba30e4 /src/libsystemd-network/arp-util.c
parent2f4cefe6ce00a38988830e88f7b16acfb6b21b3c (diff)
downloadsystemd-c10d6bdb891881f68471dabd8100ea6021e6cdbb.tar.gz
macro: introduce new TAKE_FD() macro
This is similar to TAKE_PTR() but operates on file descriptors, and thus assigns -1 to the fd parameter after returning it. Removes 60 lines from our codebase. Pretty good too I think.
Diffstat (limited to 'src/libsystemd-network/arp-util.c')
-rw-r--r--src/libsystemd-network/arp-util.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libsystemd-network/arp-util.c b/src/libsystemd-network/arp-util.c
index b8e9b2e496..3217ac0d1f 100644
--- a/src/libsystemd-network/arp-util.c
+++ b/src/libsystemd-network/arp-util.c
@@ -103,10 +103,7 @@ int arp_network_bind_raw_socket(int ifindex, be32_t address, const struct ether_
if (r < 0)
return -errno;
- r = s;
- s = -1;
-
- return r;
+ return TAKE_FD(s);
}
static int arp_send_packet(int fd, int ifindex,