tree-wide: use ASSERT_PTR more

[thirdparty/systemd.git] / src / resolve / resolved-dnssd-bus.c

diff --git a/src/resolve/resolved-dnssd-bus.c b/src/resolve/resolved-dnssd-bus.c
index 84a51ba2e610ba86f591323c7c3db2cdd4862a41..0f0d4786ef12b89946ce80581532cf361c6d6a7e 100644 (file)
--- a/src/resolve/resolved-dnssd-bus.c
+++ b/src/resolve/resolved-dnssd-bus.c
@@ -11,13 +11,12 @@
 #include "user-util.h"
 
 int bus_dnssd_method_unregister(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        DnssdService *s = userdata;
+        DnssdService *s = ASSERT_PTR(userdata);
         Manager *m;
         Link *l;
         int r;
 
         assert(message);
-        assert(s);
 
         m = s->manager;
 
@@ -63,7 +62,7 @@ int bus_dnssd_method_unregister(sd_bus_message *message, void *userdata, sd_bus_
 
 static int dnssd_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
         _cleanup_free_ char *name = NULL;
-        Manager *m = userdata;
+        Manager *m = ASSERT_PTR(userdata);
         DnssdService *service;
         int r;
 
@@ -71,7 +70,6 @@ static int dnssd_object_find(sd_bus *bus, const char *path, const char *interfac
         assert(path);
         assert(interface);
         assert(found);
-        assert(m);
 
         r = sd_bus_path_decode(path, "/org/freedesktop/resolve1/dnssd", &name);
         if (r <= 0)
@@ -87,14 +85,13 @@ static int dnssd_object_find(sd_bus *bus, const char *path, const char *interfac
 
 static int dnssd_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {
         _cleanup_strv_free_ char **l = NULL;
-        Manager *m = userdata;
+        Manager *m = ASSERT_PTR(userdata);
         DnssdService *service;
         unsigned c = 0;
         int r;
 
         assert(bus);
         assert(path);
-        assert(m);
         assert(nodes);
 
         l = new0(char*, hashmap_size(m->dnssd_services) + 1);