From 52af8e5ef954a50765863a8213a3f532cfd74c82 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 18 Sep 2023 10:16:53 +0900 Subject: [PATCH] network: drop _fallthrough_ in address_{hash,compare}_func() No functional change, just refactoring and preparation for later commit. --- src/network/networkd-address.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index c43655f57a..c56df2d628 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -363,10 +363,13 @@ static void address_hash_func(const Address *a, struct siphash *state) { uint32_t prefix = address_prefix(a); siphash24_compress(&prefix, sizeof(prefix), state); - _fallthrough_; - case AF_INET6: - siphash24_compress(&a->in_addr, FAMILY_ADDRESS_SIZE(a->family), state); + siphash24_compress(&a->in_addr.in, sizeof(a->in_addr.in), state); break; + + case AF_INET6: + siphash24_compress(&a->in_addr.in6, sizeof(a->in_addr.in6), state); + break; + default: /* treat any other address family as AF_UNSPEC */ break; @@ -391,10 +394,12 @@ static int address_compare_func(const Address *a1, const Address *a2) { if (r != 0) return r; - _fallthrough_; + return memcmp(&a1->in_addr.in, &a2->in_addr.in, sizeof(a1->in_addr.in)); + case AF_INET6: /* See kernel's ipv6_get_ifaddr() in net/ipv6/addrconf.c */ - return memcmp(&a1->in_addr, &a2->in_addr, FAMILY_ADDRESS_SIZE(a1->family)); + return memcmp(&a1->in_addr.in6, &a2->in_addr.in6, sizeof(a1->in_addr.in6)); + default: /* treat any other address family as AF_UNSPEC */ return 0;