diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-03-22 17:04:29 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-03-22 20:30:40 +0100 |
| commit | c10d6bdb891881f68471dabd8100ea6021e6cdbb (patch) | |
| tree | 99f77908217b88a1b49c1ef23d1e27c493ba30e4 /src/libsystemd-network/icmp6-util.c | |
| parent | 2f4cefe6ce00a38988830e88f7b16acfb6b21b3c (diff) | |
| download | systemd-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/icmp6-util.c')
| -rw-r--r-- | src/libsystemd-network/icmp6-util.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c index dd4e28bfd9..2347251572 100644 --- a/src/libsystemd-network/icmp6-util.c +++ b/src/libsystemd-network/icmp6-util.c @@ -98,9 +98,7 @@ static int icmp6_bind_router_message(const struct icmp6_filter *filter, if (r < 0) return -errno; - r = s; - s = -1; - return r; + return TAKE_FD(s); } int icmp6_bind_router_solicitation(int index) { |