summaryrefslogtreecommitdiffstats
path: root/src/network/networkd-ipv4acd.c
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2022-08-09 14:35:15 +0200
committerDavid Tardon <dtardon@redhat.com>2022-09-13 08:13:27 +0200
commit995340074e554b4bf4a0fdb0cb7436692c5a4ffd (patch)
treeca3ee001db3e608ee80478f42fea9c3b409f1b7b /src/network/networkd-ipv4acd.c
parentMerge pull request #23087 from yuwata/udev-watch (diff)
downloadsystemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.tar.xz
systemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.zip
tree-wide: use ASSERT_PTR more
Diffstat (limited to 'src/network/networkd-ipv4acd.c')
-rw-r--r--src/network/networkd-ipv4acd.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/network/networkd-ipv4acd.c b/src/network/networkd-ipv4acd.c
index a633575444..4127657ebd 100644
--- a/src/network/networkd-ipv4acd.c
+++ b/src/network/networkd-ipv4acd.c
@@ -116,12 +116,11 @@ static int dhcp4_address_on_conflict(Link *link, Address *address) {
}
static void on_acd(sd_ipv4acd *acd, int event, void *userdata) {
- Address *address = userdata;
+ Address *address = ASSERT_PTR(userdata);
Link *link;
int r;
assert(acd);
- assert(address);
assert(address->acd == acd);
assert(address->link);
assert(address->family == AF_INET);
@@ -170,10 +169,9 @@ static void on_acd(sd_ipv4acd *acd, int event, void *userdata) {
}
static int ipv4acd_check_mac(sd_ipv4acd *acd, const struct ether_addr *mac, void *userdata) {
- Manager *m = userdata;
+ Manager *m = ASSERT_PTR(userdata);
struct hw_addr_data hw_addr;
- assert(m);
assert(mac);
hw_addr = (struct hw_addr_data) {