tree-wide: use ASSERT_PTR more

[thirdparty/systemd.git] / src / libsystemd / sd-netlink / sd-netlink.c

diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c
index 912efcf3ad9a97c9f615b3ea644d1fd8ebb745da..b1a684a9af68b72f852658ddc289ebae41d3d939 100644 (file)
--- a/src/libsystemd/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/sd-netlink/sd-netlink.c
@@ -678,11 +678,9 @@ _public_ int sd_netlink_get_timeout(sd_netlink *nl, uint64_t *timeout_usec) {
 }
 
 static int io_callback(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
-        sd_netlink *nl = userdata;
+        sd_netlink *nl = ASSERT_PTR(userdata);
         int r;
 
-        assert(nl);
-
         r = sd_netlink_process(nl, NULL);
         if (r < 0)
                 return r;
@@ -691,11 +689,9 @@ static int io_callback(sd_event_source *s, int fd, uint32_t revents, void *userd
 }
 
 static int time_callback(sd_event_source *s, uint64_t usec, void *userdata) {
-        sd_netlink *nl = userdata;
+        sd_netlink *nl = ASSERT_PTR(userdata);
         int r;
 
-        assert(nl);
-
         r = sd_netlink_process(nl, NULL);
         if (r < 0)
                 return r;
@@ -704,12 +700,11 @@ static int time_callback(sd_event_source *s, uint64_t usec, void *userdata) {
 }
 
 static int prepare_callback(sd_event_source *s, void *userdata) {
-        sd_netlink *nl = userdata;
+        sd_netlink *nl = ASSERT_PTR(userdata);
         int r, enabled;
         usec_t until;
 
         assert(s);
-        assert(nl);
 
         r = sd_netlink_get_events(nl);
         if (r < 0)