tree-wide: use ASSERT_PTR more

[thirdparty/systemd.git] / src / network / networkd-link-bus.c

diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index f4e355651744c5ddb9869b784d75aa4d56ffd02e..193d1d3e1eba131f03e0e9e0aaa15ed02b276ce2 100644 (file)
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -36,14 +36,13 @@ static int property_get_bit_rates(
                 void *userdata,
                 sd_bus_error *error) {
 
-        Link *link = userdata;
+        Link *link = ASSERT_PTR(userdata);
         Manager *manager;
         double interval_sec;
         uint64_t tx, rx;
 
         assert(bus);
         assert(reply);
-        assert(userdata);
 
         manager = link->manager;
 
@@ -79,12 +78,10 @@ static int verify_managed_link(Link *l, sd_bus_error *error) {
 
 int bus_link_method_set_ntp_servers(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         _cleanup_strv_free_ char **ntp = NULL;
-        Link *l = userdata;
+        Link *l = ASSERT_PTR(userdata);
         int r;
-        char **i;
 
         assert(message);
-        assert(l);
 
         r = verify_managed_link(l, error);
         if (r < 0)
@@ -123,12 +120,11 @@ int bus_link_method_set_ntp_servers(sd_bus_message *message, void *userdata, sd_
 
 static int bus_link_method_set_dns_servers_internal(sd_bus_message *message, void *userdata, sd_bus_error *error, bool extended) {
         struct in_addr_full **dns;
-        Link *l = userdata;
+        Link *l = ASSERT_PTR(userdata);
         size_t n;
         int r;
 
         assert(message);
-        assert(l);
 
         r = verify_managed_link(l, error);
         if (r < 0)
@@ -181,11 +177,10 @@ int bus_link_method_set_dns_servers_ex(sd_bus_message *message, void *userdata,
 
 int bus_link_method_set_domains(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         _cleanup_ordered_set_free_ OrderedSet *search_domains = NULL, *route_domains = NULL;
-        Link *l = userdata;
+        Link *l = ASSERT_PTR(userdata);
         int r;
 
         assert(message);
-        assert(l);
 
         r = verify_managed_link(l, error);
         if (r < 0)
@@ -195,9 +190,16 @@ int bus_link_method_set_domains(sd_bus_message *message, void *userdata, sd_bus_
         if (r < 0)
                 return r;
 
+        search_domains = ordered_set_new(&string_hash_ops_free);
+        if (!search_domains)
+                return -ENOMEM;
+
+        route_domains = ordered_set_new(&string_hash_ops_free);
+        if (!route_domains)
+                return -ENOMEM;
+
         for (;;) {
                 _cleanup_free_ char *str = NULL;
-                OrderedSet **domains;
                 const char *name;
                 int route_only;
 
@@ -219,12 +221,7 @@ int bus_link_method_set_domains(sd_bus_message *message, void *userdata, sd_bus_
                 if (r < 0)
                         return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid search domain %s", name);
 
-                domains = route_only ? &route_domains : &search_domains;
-                r = ordered_set_ensure_allocated(domains, &string_hash_ops_free);
-                if (r < 0)
-                        return r;
-
-                r = ordered_set_consume(*domains, TAKE_PTR(str));
+                r = ordered_set_consume(route_only ? route_domains : search_domains, TAKE_PTR(str));
                 if (r == -EEXIST)
                         continue;
                 if (r < 0)
@@ -258,11 +255,10 @@ int bus_link_method_set_domains(sd_bus_message *message, void *userdata, sd_bus_
 }
 
 int bus_link_method_set_default_route(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Link *l = userdata;
+        Link *l = ASSERT_PTR(userdata);
         int r, b;
 
         assert(message);
-        assert(l);
 
         r = verify_managed_link(l, error);
         if (r < 0)
@@ -294,13 +290,12 @@ int bus_link_method_set_default_route(sd_bus_message *message, void *userdata, s
 }
 
 int bus_link_method_set_llmnr(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Link *l = userdata;
+        Link *l = ASSERT_PTR(userdata);
         ResolveSupport mode;
         const char *llmnr;
         int r;
 
         assert(message);
-        assert(l);
 
         r = verify_managed_link(l, error);
         if (r < 0)
@@ -340,13 +335,12 @@ int bus_link_method_set_llmnr(sd_bus_message *message, void *userdata, sd_bus_er
 }
 
 int bus_link_method_set_mdns(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Link *l = userdata;
+        Link *l = ASSERT_PTR(userdata);
         ResolveSupport mode;
         const char *mdns;
         int r;
 
         assert(message);
-        assert(l);
 
         r = verify_managed_link(l, error);
         if (r < 0)
@@ -386,13 +380,12 @@ int bus_link_method_set_mdns(sd_bus_message *message, void *userdata, sd_bus_err
 }
 
 int bus_link_method_set_dns_over_tls(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Link *l = userdata;
+        Link *l = ASSERT_PTR(userdata);
         const char *dns_over_tls;
         DnsOverTlsMode mode;
         int r;
 
         assert(message);
-        assert(l);
 
         r = verify_managed_link(l, error);
         if (r < 0)
@@ -432,13 +425,12 @@ int bus_link_method_set_dns_over_tls(sd_bus_message *message, void *userdata, sd
 }
 
 int bus_link_method_set_dnssec(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Link *l = userdata;
+        Link *l = ASSERT_PTR(userdata);
         const char *dnssec;
         DnssecMode mode;
         int r;
 
         assert(message);
-        assert(l);
 
         r = verify_managed_link(l, error);
         if (r < 0)
@@ -480,12 +472,10 @@ int bus_link_method_set_dnssec(sd_bus_message *message, void *userdata, sd_bus_e
 int bus_link_method_set_dnssec_negative_trust_anchors(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         _cleanup_set_free_free_ Set *ns = NULL;
         _cleanup_strv_free_ char **ntas = NULL;
-        Link *l = userdata;
+        Link *l = ASSERT_PTR(userdata);
         int r;
-        char **i;
 
         assert(message);
-        assert(l);
 
         r = verify_managed_link(l, error);
         if (r < 0)
@@ -534,11 +524,10 @@ int bus_link_method_set_dnssec_negative_trust_anchors(sd_bus_message *message, v
 }
 
 int bus_link_method_revert_ntp(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Link *l = userdata;
+        Link *l = ASSERT_PTR(userdata);
         int r;
 
         assert(message);
-        assert(l);
 
         r = verify_managed_link(l, error);
         if (r < 0)
@@ -564,11 +553,10 @@ int bus_link_method_revert_ntp(sd_bus_message *message, void *userdata, sd_bus_e
 }
 
 int bus_link_method_revert_dns(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Link *l = userdata;
+        Link *l = ASSERT_PTR(userdata);
         int r;
 
         assert(message);
-        assert(l);
 
         r = verify_managed_link(l, error);
         if (r < 0)
@@ -594,11 +582,9 @@ int bus_link_method_revert_dns(sd_bus_message *message, void *userdata, sd_bus_e
 }
 
 int bus_link_method_force_renew(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Link *l = userdata;
+        Link *l = ASSERT_PTR(userdata);
         int r;
 
-        assert(l);
-
         if (!l->network)
                 return sd_bus_error_setf(error, BUS_ERROR_UNMANAGED_INTERFACE,
                                          "Interface %s is not managed by systemd-networkd",
@@ -623,11 +609,9 @@ int bus_link_method_force_renew(sd_bus_message *message, void *userdata, sd_bus_
 }
 
 int bus_link_method_renew(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Link *l = userdata;
+        Link *l = ASSERT_PTR(userdata);
         int r;
 
-        assert(l);
-
         if (!l->network)
                 return sd_bus_error_setf(error, BUS_ERROR_UNMANAGED_INTERFACE,
                                          "Interface %s is not managed by systemd-networkd",
@@ -652,11 +636,10 @@ int bus_link_method_renew(sd_bus_message *message, void *userdata, sd_bus_error
 }
 
 int bus_link_method_reconfigure(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        Link *l = userdata;
+        Link *l = ASSERT_PTR(userdata);
         int r;
 
         assert(message);
-        assert(l);
 
         r = bus_verify_polkit_async(message, CAP_NET_ADMIN,
                                     "org.freedesktop.network1.reconfigure",
@@ -684,11 +667,10 @@ int bus_link_method_describe(sd_bus_message *message, void *userdata, sd_bus_err
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
         _cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
         _cleanup_free_ char *text = NULL;
-        Link *link = userdata;
+        Link *link = ASSERT_PTR(userdata);
         int r;
 
         assert(message);
-        assert(link);
 
         r = link_build_json(link, &v);
         if (r < 0)
@@ -709,7 +691,7 @@ int bus_link_method_describe(sd_bus_message *message, void *userdata, sd_bus_err
         return sd_bus_send(NULL, reply, NULL);
 }
 
-const sd_bus_vtable link_vtable[] = {
+static const sd_bus_vtable link_vtable[] = {
         SD_BUS_VTABLE_START(0),
 
         SD_BUS_PROPERTY("OperationalState", "s", property_get_operational_state, offsetof(Link, operstate), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
@@ -825,13 +807,12 @@ char *link_bus_path(Link *link) {
 
 int link_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);
         unsigned c = 0;
         Link *link;
 
         assert(bus);
         assert(path);
-        assert(m);
         assert(nodes);
 
         l = new0(char*, hashmap_size(m->links_by_index) + 1);
@@ -856,14 +837,13 @@ int link_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***
 
 int link_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
         _cleanup_free_ char *identifier = NULL;
-        Manager *m = userdata;
+        Manager *m = ASSERT_PTR(userdata);
         Link *link;
         int ifindex, r;
 
         assert(bus);
         assert(path);
         assert(interface);
-        assert(m);
         assert(found);
 
         r = sd_bus_path_decode(path, "/org/freedesktop/network1/link", &identifier);
@@ -914,3 +894,10 @@ int link_send_changed(Link *link, const char *property, ...) {
 
         return link_send_changed_strv(link, properties);
 }
+
+const BusObjectImplementation link_object = {
+        "/org/freedesktop/network1/link",
+        "org.freedesktop.network1.Link",
+        .fallback_vtables = BUS_FALLBACK_VTABLES({link_vtable, link_object_find}),
+        .node_enumerator = link_node_enumerator,
+};