diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-11-30 10:22:39 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-11-30 10:23:58 +0900 |
commit | 4bbe559b5c06387a56cb765076790a4bd47d0e82 (patch) | |
tree | 7004525c86fad766b32a300241d2958ea6fa8882 | |
parent | aaad20e0e1066ae9efa51251ecfa1c30a14dd323 (diff) | |
download | systemd-4bbe559b5c06387a56cb765076790a4bd47d0e82.tar.gz |
network: address: use ASSERT_PTR()
-rw-r--r-- | src/network/networkd-address.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index e6db72f4f4..eae374323e 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -462,14 +462,9 @@ static int address_add(Link *link, Address *address) { } static int address_update(Address *address) { - Link *link; + Link *link = ASSERT_PTR(ASSERT_PTR(address)->link); int r; - assert(address); - assert(address->link); - - link = address->link; - if (address_is_ready(address) && address->family == AF_INET6 && in6_addr_is_link_local(&address->in_addr.in6) && @@ -485,7 +480,7 @@ static int address_update(Address *address) { if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) return 0; - r = address_set_masquerade(address, true); + r = address_set_masquerade(address, /* add = */ true); if (r < 0) return log_link_warning_errno(link, r, "Could not enable IP masquerading: %m"); @@ -497,21 +492,16 @@ static int address_update(Address *address) { return r; } - link_update_operstate(link, true); + link_update_operstate(link, /* also_update_master = */ true); link_check_ready(link); return 0; } static int address_drop(Address *address) { - Link *link; + Link *link = ASSERT_PTR(ASSERT_PTR(address)->link); int r; - assert(address); - assert(address->link); - - link = address->link; - - r = address_set_masquerade(address, false); + r = address_set_masquerade(address, /* add = */ false); if (r < 0) log_link_warning_errno(link, r, "Failed to disable IP masquerading, ignoring: %m"); |