tree-wide: use ASSERT_PTR more

[thirdparty/systemd.git] / src / libsystemd-network / sd-dhcp-server.c

diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c
index 5c9ba9f61832c0d6026d611a0743dc3dd5f0dc8d..11ab2338cecbf55f9ebcfb21a5dda9bf32685fbd 100644 (file)
--- a/src/libsystemd-network/sd-dhcp-server.c
+++ b/src/libsystemd-network/sd-dhcp-server.c
@@ -733,9 +733,7 @@ static int server_send_forcerenew(
 }
 
 static int parse_request(uint8_t code, uint8_t len, const void *option, void *userdata) {
-        DHCPRequest *req = userdata;
-
-        assert(req);
+        DHCPRequest *req = ASSERT_PTR(userdata);
 
         switch (code) {
         case SD_DHCP_OPTION_IP_ADDRESS_LEASE_TIME:
@@ -1264,7 +1262,7 @@ static int server_receive_message(sd_event_source *s, int fd,
                                   uint32_t revents, void *userdata) {
         _cleanup_free_ DHCPMessage *message = NULL;
         CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct in_pktinfo))) control;
-        sd_dhcp_server *server = userdata;
+        sd_dhcp_server *server = ASSERT_PTR(userdata);
         struct iovec iov = {};
         struct msghdr msg = {
                 .msg_iov = &iov,
@@ -1276,8 +1274,6 @@ static int server_receive_message(sd_event_source *s, int fd,
         ssize_t datagram_size, len;
         int r;
 
-        assert(server);
-
         datagram_size = next_datagram_size_fd(fd);
         if (datagram_size < 0) {
                 if (ERRNO_IS_TRANSIENT(datagram_size) || ERRNO_IS_DISCONNECT(datagram_size))