diff options
| author | Lennart Poettering <lennart@poettering.net> | 2023-03-07 22:50:41 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2023-03-10 09:36:18 +0100 |
| commit | 5f64d2bf332371bdfdcb91b588e57d4c0c20428f (patch) | |
| tree | 633471519025000877040d30cf69af887d1625e1 /src/basic/socket-util.c | |
| parent | 862481ece080a72c5f0e43963e211a10e920f44c (diff) | |
| download | systemd-5f64d2bf332371bdfdcb91b588e57d4c0c20428f.tar.gz | |
socket-util: fix socket_get_family()
Function didn't actually return anything useful. Quite a shame.
Diffstat (limited to 'src/basic/socket-util.c')
| -rw-r--r-- | src/basic/socket-util.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c index f01873e608..43b292252c 100644 --- a/src/basic/socket-util.c +++ b/src/basic/socket-util.c @@ -1307,7 +1307,7 @@ ssize_t recvmsg_safe(int sockfd, struct msghdr *msg, int flags) { return n; } -int socket_get_family(int fd, int *ret) { +int socket_get_family(int fd) { int af; socklen_t sl = sizeof(af); @@ -1321,12 +1321,11 @@ int socket_get_family(int fd, int *ret) { } int socket_set_recvpktinfo(int fd, int af, bool b) { - int r; if (af == AF_UNSPEC) { - r = socket_get_family(fd, &af); - if (r < 0) - return r; + af = socket_get_family(fd); + if (af < 0) + return af; } switch (af) { @@ -1350,12 +1349,11 @@ int socket_set_recvpktinfo(int fd, int af, bool b) { int socket_set_unicast_if(int fd, int af, int ifi) { be32_t ifindex_be = htobe32(ifi); - int r; if (af == AF_UNSPEC) { - r = socket_get_family(fd, &af); - if (r < 0) - return r; + af = socket_get_family(fd); + if (af < 0) + return af; } switch (af) { @@ -1372,12 +1370,10 @@ int socket_set_unicast_if(int fd, int af, int ifi) { } int socket_set_option(int fd, int af, int opt_ipv4, int opt_ipv6, int val) { - int r; - if (af == AF_UNSPEC) { - r = socket_get_family(fd, &af); - if (r < 0) - return r; + af = socket_get_family(fd); + if (af < 0) + return af; } switch (af) { @@ -1397,9 +1393,9 @@ int socket_get_mtu(int fd, int af, size_t *ret) { int mtu, r; if (af == AF_UNSPEC) { - r = socket_get_family(fd, &af); - if (r < 0) - return r; + af = socket_get_family(fd); + if (af < 0) + return af; } switch (af) { |