network: drop unused "callback" arguments in route_remove() and address_remove()

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 2bc860954bd30563367d76f35b4711c8a0efe72d..79a90293dca94e25c08c54c142a878b9fb51c140 100644 (file)
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -653,14 +653,13 @@ static int address_set_netlink_message(const Address *address, sd_netlink_messag
         return 0;
 }
 
-int address_remove_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Link *link, const char *error_msg) {
+static int address_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
         int r;
 
         assert(rtnl);
         assert(m);
         assert(link);
         assert(link->address_remove_messages > 0);
-        assert(error_msg);
 
         link->address_remove_messages--;
 
@@ -669,22 +668,14 @@ int address_remove_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Lin
 
         r = sd_netlink_message_get_errno(m);
         if (r < 0 && r != -EADDRNOTAVAIL)
-                log_link_message_warning_errno(link, m, r, error_msg);
+                log_link_message_warning_errno(link, m, r, "Could not drop address");
         else if (r >= 0)
                 (void) manager_rtnl_process_address(rtnl, m, link->manager);
 
         return 1;
 }
 
-static int address_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
-        return address_remove_handler_internal(rtnl, m, link, "Could not drop address");
-}
-
-int address_remove(
-                const Address *address,
-                Link *link,
-                link_netlink_message_handler_t callback) {
-
+int address_remove(const Address *address, Link *link) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
         int r;
 
@@ -707,7 +698,7 @@ int address_remove(
                 return r;
 
         r = netlink_call_async(link->manager->rtnl, NULL, req,
-                               callback ?: address_remove_handler,
+                               address_remove_handler,
                                link_netlink_destroy_callback, link);
         if (r < 0)
                 return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
@@ -834,7 +825,7 @@ int link_drop_foreign_addresses(Link *link) {
                                         r = k;
                         }
                 } else {
-                        k = address_remove(address, link, NULL);
+                        k = address_remove(address, link);
                         if (k < 0 && r >= 0)
                                 r = k;
                 }
@@ -854,7 +845,7 @@ int link_drop_addresses(Link *link) {
                 if (address->family == AF_INET6 && in6_addr_is_link_local(&address->in_addr.in6) == 1 && link_ipv6ll_enabled(link))
                         continue;
 
-                k = address_remove(address, link, NULL);
+                k = address_remove(address, link);
                 if (k < 0 && r >= 0) {
                         r = k;
                         continue;
@@ -1434,7 +1425,7 @@ static void static_address_on_acd(sd_ipv4acd *acd, int event, void *userdata) {
         case SD_IPV4ACD_EVENT_CONFLICT:
                 log_link_warning(link, "DAD conflict. Dropping address "IPV4_ADDRESS_FMT_STR,
                                  IPV4_ADDRESS_FMT_VAL(address->in_addr.in));
-                r = address_remove(address, link, NULL);
+                r = address_remove(address, link);
                 if (r < 0)
                         log_link_error_errno(link, r, "Failed to drop DAD conflicted address "IPV4_ADDRESS_FMT_STR,
                                              IPV4_ADDRESS_FMT_VAL(address->in_addr.in));

diff --git a/src/network/networkd-address.h b/src/network/networkd-address.h
index f63848e2e7a14b3637a2226835564c61785a8b43..af9f05c1e90bd41bab923eba6d5524b1aceca1eb 100644 (file)
--- a/src/network/networkd-address.h
+++ b/src/network/networkd-address.h
@@ -53,8 +53,7 @@ int address_new(Address **ret);
 Address *address_free(Address *address);
 int address_get(Link *link, const Address *in, Address **ret);
 int address_configure_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Link *link, const char *error_msg);
-int address_remove_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Link *link, const char *error_msg);
-int address_remove(const Address *address, Link *link, link_netlink_message_handler_t callback);
+int address_remove(const Address *address, Link *link);
 bool address_equal(const Address *a1, const Address *a2);
 bool address_is_ready(const Address *a);
 void address_set_broadcast(Address *a);

diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index 261c6501ea8134937b9cc954e958b55cee9e5fac..e9e6fe72c41b99f54b426c014a54fdcfcd4f98d4 100644 (file)
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -66,13 +66,13 @@ static int dhcp4_release_old_lease(Link *link) {
         log_link_debug(link, "Removing old DHCPv4 address and routes.");
 
         SET_FOREACH(route, link->dhcp_routes_old) {
-                k = route_remove(route, NULL, link, NULL);
+                k = route_remove(route, NULL, link);
                 if (k < 0)
                         r = k;
         }
 
         if (link->dhcp_address_old) {
-                k = address_remove(link->dhcp_address_old, link, NULL);
+                k = address_remove(link->dhcp_address_old, link);
                 if (k < 0)
                         r = k;
         }
@@ -723,13 +723,13 @@ static int dhcp4_remove_all(Link *link) {
         assert(link);
 
         SET_FOREACH(route, link->dhcp_routes) {
-                k = route_remove(route, NULL, link, NULL);
+                k = route_remove(route, NULL, link);
                 if (k < 0)
                         r = k;
         }
 
         if (link->dhcp_address) {
-                k = address_remove(link->dhcp_address, link, NULL);
+                k = address_remove(link->dhcp_address, link);
                 if (k < 0)
                         r = k;
         }
@@ -948,7 +948,7 @@ static int dhcp4_after_address_configure(Request *req, void *object) {
                 if (link->dhcp_address_old &&
                     !address_equal(link->dhcp_address_old, link->dhcp_address)) {
                         /* Still too old address exists? Let's remove it immediately. */
-                        r = address_remove(link->dhcp_address_old, link, NULL);
+                        r = address_remove(link->dhcp_address_old, link);
                         if (r < 0)
                                 return r;
                 }

diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index e8c7d8ebd85a2185d68bdefa8c1e6ab64cde7e71..7a2e7c106cbc9ba7132efede5c94a2a02b35d9b9 100644 (file)
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -170,7 +170,7 @@ static int dhcp6_pd_remove_old(Link *link, bool force) {
         log_link_debug(link, "Removing old DHCPv6 Prefix Delegation addresses and routes.");
 
         SET_FOREACH(route, link->dhcp6_pd_routes_old) {
-                k = route_remove(route, NULL, link, NULL);
+                k = route_remove(route, NULL, link);
                 if (k < 0)
                         r = k;
 
@@ -180,7 +180,7 @@ static int dhcp6_pd_remove_old(Link *link, bool force) {
         }
 
         SET_FOREACH(address, link->dhcp6_pd_addresses_old) {
-                k = address_remove(address, link, NULL);
+                k = address_remove(address, link);
                 if (k < 0)
                         r = k;
         }
@@ -212,7 +212,7 @@ int dhcp6_pd_remove(Link *link) {
         log_link_debug(link, "Removing DHCPv6 Prefix Delegation addresses and routes.");
 
         SET_FOREACH(route, link->dhcp6_pd_routes) {
-                k = route_remove(route, NULL, link, NULL);
+                k = route_remove(route, NULL, link);
                 if (k < 0)
                         r = k;
 
@@ -222,7 +222,7 @@ int dhcp6_pd_remove(Link *link) {
         }
 
         SET_FOREACH(address, link->dhcp6_pd_addresses) {
-                k = address_remove(address, link, NULL);
+                k = address_remove(address, link);
                 if (k < 0)
                         r = k;
         }
@@ -761,13 +761,13 @@ static int dhcp6_remove_old(Link *link, bool force) {
         log_link_debug(link, "Removing old DHCPv6 addresses and routes.");
 
         SET_FOREACH(route, link->dhcp6_routes_old) {
-                k = route_remove(route, NULL, link, NULL);
+                k = route_remove(route, NULL, link);
                 if (k < 0)
                         r = k;
         }
 
         SET_FOREACH(address, link->dhcp6_addresses_old) {
-                k = address_remove(address, link, NULL);
+                k = address_remove(address, link);
                 if (k < 0)
                         r = k;
         }
@@ -795,13 +795,13 @@ static int dhcp6_remove(Link *link) {
         log_link_debug(link, "Removing DHCPv6 addresses and routes.");
 
         SET_FOREACH(route, link->dhcp6_routes) {
-                k = route_remove(route, NULL, link, NULL);
+                k = route_remove(route, NULL, link);
                 if (k < 0)
                         r = k;
         }
 
         SET_FOREACH(address, link->dhcp6_addresses) {
-                k = address_remove(address, link, NULL);
+                k = address_remove(address, link);
                 if (k < 0)
                         r = k;
         }

diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c
index 12ba5c085ad8d0595ecae2581db3b11b08e8b17a..2ad7f2c5dc67faf78a2c38606d77b42cc45005e1 100644 (file)
--- a/src/network/networkd-ipv4ll.c
+++ b/src/network/networkd-ipv4ll.c
@@ -56,7 +56,7 @@ static int ipv4ll_address_lost(Link *link) {
         log_link_debug(link, "IPv4 link-local release "IPV4_ADDRESS_FMT_STR,
                        IPV4_ADDRESS_FMT_VAL(address->in_addr.in));
 
-        return address_remove(address, link, NULL);
+        return address_remove(address, link);
 }
 
 static int ipv4ll_address_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 56aa5ec8a77c18b0bc8374cb12fd27fcb81e92b6..d678d49bdeccb83de6f35c9f393b074c1c42a463 100644 (file)
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -171,14 +171,14 @@ static int ndisc_remove_old_one(Link *link, const struct in6_addr *router, bool
 
         SET_FOREACH(na, link->ndisc_addresses)
                 if (na->marked && in6_addr_equal(&na->router, router)) {
-                        k = address_remove(na->address, link, NULL);
+                        k = address_remove(na->address, link);
                         if (k < 0)
                                 r = k;
                 }
 
         SET_FOREACH(nr, link->ndisc_routes)
                 if (nr->marked && in6_addr_equal(&nr->router, router)) {
-                        k = route_remove(nr->route, NULL, link, NULL);
+                        k = route_remove(nr->route, NULL, link);
                         if (k < 0)
                                 r = k;
                 }

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index e6c1d712659e5d2e7c5682f7d3cb76ca7d9d23b9..2f4a34eb97b35f803afc7c0b4b02295f6f10ffb5 100644 (file)
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -903,13 +903,12 @@ static int route_set_netlink_message(const Route *route, sd_netlink_message *req
         return 0;
 }
 
-int link_route_remove_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Link *link, const char *error_msg) {
+static int link_route_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
         int r;
 
         assert(m);
         assert(link);
         assert(link->route_remove_messages > 0);
-        assert(error_msg);
 
         link->route_remove_messages--;
 
@@ -918,15 +917,11 @@ int link_route_remove_handler_internal(sd_netlink *rtnl, sd_netlink_message *m,
 
         r = sd_netlink_message_get_errno(m);
         if (r < 0 && r != -ESRCH)
-                log_link_message_warning_errno(link, m, r, error_msg);
+                log_link_message_warning_errno(link, m, r, "Could not drop route, ignoring");
 
         return 1;
 }
 
-static int link_route_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
-        return link_route_remove_handler_internal(rtnl, m, link, "Could not drop route, ignoring");
-}
-
 static int manager_route_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Manager *manager) {
         int r;
 
@@ -943,12 +938,7 @@ static int manager_route_remove_handler(sd_netlink *rtnl, sd_netlink_message *m,
         return 1;
 }
 
-int route_remove(
-                const Route *route,
-                Manager *manager,
-                Link *link,
-                link_netlink_message_handler_t callback) {
-
+int route_remove(const Route *route, Manager *manager, Link *link) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
         unsigned char type;
         int r;
@@ -988,7 +978,7 @@ int route_remove(
 
         if (link) {
                 r = netlink_call_async(manager->rtnl, NULL, req,
-                                       callback ?: link_route_remove_handler,
+                                       link_route_remove_handler,
                                        link_netlink_destroy_callback, link);
                 if (r < 0)
                         return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
@@ -1062,7 +1052,7 @@ static int manager_drop_routes_internal(Manager *manager, bool foreign, const Li
 
                 /* The existing links do not have the route. Let's drop this now. It may be
                  * re-configured later. */
-                k = route_remove(route, manager, NULL, NULL);
+                k = route_remove(route, manager, NULL);
                 if (k < 0 && r >= 0)
                         r = k;
 
@@ -1112,7 +1102,7 @@ int link_drop_foreign_routes(Link *link) {
                 if (link_has_static_route(link, route))
                         k = route_add(NULL, link, route, NULL, NULL, NULL);
                 else
-                        k = route_remove(route, NULL, link, NULL);
+                        k = route_remove(route, NULL, link);
                 if (k < 0 && r >= 0)
                         r = k;
         }
@@ -1135,7 +1125,7 @@ int link_drop_routes(Link *link) {
                 if (route->protocol == RTPROT_KERNEL)
                         continue;
 
-                k = route_remove(route, NULL, link, NULL);
+                k = route_remove(route, NULL, link);
                 if (k < 0 && r >= 0)
                         r = k;
         }
@@ -1153,7 +1143,7 @@ static int route_expire_handler(sd_event_source *s, uint64_t usec, void *userdat
 
         assert(route);
 
-        r = route_remove(route, route->manager, route->link, NULL);
+        r = route_remove(route, route->manager, route->link);
         if (r < 0) {
                 log_link_warning_errno(route->link, r, "Could not remove route: %m");
                 route_free(route);

diff --git a/src/network/networkd-route.h b/src/network/networkd-route.h
index bb007dd74aa2aa41761b96dfe72d3842457ae7d2..095a07e05de6de44b3e5c5a3bfb3120965d0824c 100644 (file)
--- a/src/network/networkd-route.h
+++ b/src/network/networkd-route.h
@@ -74,8 +74,7 @@ DEFINE_NETWORK_SECTION_FUNCTIONS(Route, route_free);
 int route_dup(const Route *src, Route **ret);
 
 int route_configure_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Link *link, const char *error_msg);
-int link_route_remove_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Link *link, const char *error_msg);
-int route_remove(const Route *route, Manager *manager, Link *link, link_netlink_message_handler_t callback);
+int route_remove(const Route *route, Manager *manager, Link *link);
 
 int link_has_route(Link *link, const Route *route);
 bool manager_address_is_reachable(Manager *manager, int family, const union in_addr_union *address);