shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-30 01:47:42 +03:00
Code

network: drop _fallthrough_ in address_{hash,compare}_func()

Browse Source 
No functional change, just refactoring and preparation for later commit.
This commit is contained in:
Yu Watanabe 2023-09-18 10:16:53 +09:00
parent 413ef50af3
commit 52af8e5ef9
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/network/networkd-address.c
View File

@ -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;