sd-bus: drop bus parameter from message callback prototype

This should simplify the prototype a bit. The bus parameter is redundant
in most cases, and in the few where it matters it can be derived from
the message via sd_bus_message_get_bus().

2 files changed, 4 insertions, 5 deletions

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index ab115a053b..0f9a1cd6d1 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -734,11 +734,11 @@ static int link_set_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         return 0;
 }
 
-static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata,
-                                sd_bus_error *ret_error) {
+static int set_hostname_handler(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
         _cleanup_link_unref_ Link *link = userdata;
         int r;
 
+        assert(m);
         assert(link);
 
         if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 0e204ebae6..db737ad484 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -105,12 +105,11 @@ static int manager_reset_all(Manager *m) {
         return 0;
 }
 
-static int match_prepare_for_sleep(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *ret_error) {
+static int match_prepare_for_sleep(sd_bus_message *message, void *userdata, sd_bus_error *ret_error) {
         Manager *m = userdata;
         int b, r;
 
-        assert(bus);
-        assert(bus);
+        assert(message);
 
         r = sd_bus_message_read(message, "b", &b);
         if (r < 0) {