diff options
| -rw-r--r-- | src/libsystemd-terminal/grdev-drm.c | 9 | ||||
| -rw-r--r-- | src/libsystemd-terminal/idev-evdev.c | 3 | ||||
| -rw-r--r-- | src/libsystemd-terminal/idev-keyboard.c | 8 | ||||
| -rw-r--r-- | src/libsystemd-terminal/idev.c | 6 | ||||
| -rw-r--r-- | src/libsystemd-terminal/sysview.c | 12 |
5 files changed, 13 insertions, 25 deletions
diff --git a/src/libsystemd-terminal/grdev-drm.c b/src/libsystemd-terminal/grdev-drm.c index 066a4d8b10..01a70fd320 100644 --- a/src/libsystemd-terminal/grdev-drm.c +++ b/src/libsystemd-terminal/grdev-drm.c @@ -2655,8 +2655,7 @@ static void managed_card_disable(grdev_card *card) { grdrm_card_disable(&cm->card); } -static int managed_card_pause_device_fn(sd_bus *bus, - sd_bus_message *signal, +static int managed_card_pause_device_fn(sd_bus_message *signal, void *userdata, sd_bus_error *ret_error) { managed_card *cm = userdata; @@ -2744,8 +2743,7 @@ static int managed_card_pause_device_fn(sd_bus *bus, return 0; } -static int managed_card_resume_device_fn(sd_bus *bus, - sd_bus_message *signal, +static int managed_card_resume_device_fn(sd_bus_message *signal, void *userdata, sd_bus_error *ret_error) { managed_card *cm = userdata; @@ -2847,8 +2845,7 @@ static int managed_card_setup_bus(managed_card *cm) { return 0; } -static int managed_card_take_device_fn(sd_bus *bus, - sd_bus_message *reply, +static int managed_card_take_device_fn(sd_bus_message *reply, void *userdata, sd_bus_error *ret_error) { managed_card *cm = userdata; diff --git a/src/libsystemd-terminal/idev-evdev.c b/src/libsystemd-terminal/idev-evdev.c index 91ae507d91..64e703eb67 100644 --- a/src/libsystemd-terminal/idev-evdev.c +++ b/src/libsystemd-terminal/idev-evdev.c @@ -527,8 +527,7 @@ static const idev_element_vtable unmanaged_evdev_vtable = { * you run inside a user session with exclusive device access. */ -static int managed_evdev_take_device_fn(sd_bus *bus, - sd_bus_message *reply, +static int managed_evdev_take_device_fn(sd_bus_message *reply, void *userdata, sd_bus_error *ret_error) { managed_evdev *em = userdata; diff --git a/src/libsystemd-terminal/idev-keyboard.c b/src/libsystemd-terminal/idev-keyboard.c index b5eb7371ab..ef56ee2482 100644 --- a/src/libsystemd-terminal/idev-keyboard.c +++ b/src/libsystemd-terminal/idev-keyboard.c @@ -387,8 +387,7 @@ static const struct bus_properties_map kbdctx_locale_map[] = { { }, }; -static int kbdctx_locale_get_all_fn(sd_bus *bus, - sd_bus_message *m, +static int kbdctx_locale_get_all_fn(sd_bus_message *m, void *userdata, sd_bus_error *ret_err) { kbdctx *kc = userdata; @@ -404,7 +403,7 @@ static int kbdctx_locale_get_all_fn(sd_bus *bus, return 0; } - r = bus_message_map_all_properties(bus, m, kbdctx_locale_map, kc); + r = bus_message_map_all_properties(m, kbdctx_locale_map, kc); if (r < 0) { log_debug("idev-keyboard: erroneous GetAll() reply from locale1"); return 0; @@ -448,8 +447,7 @@ error: return log_debug_errno(r, "idev-keyboard: cannot send GetAll to locale1: %m"); } -static int kbdctx_locale_props_changed_fn(sd_bus *bus, - sd_bus_message *signal, +static int kbdctx_locale_props_changed_fn(sd_bus_message *signal, void *userdata, sd_bus_error *ret_err) { kbdctx *kc = userdata; diff --git a/src/libsystemd-terminal/idev.c b/src/libsystemd-terminal/idev.c index 44be7c30d2..0ba2b28ab7 100644 --- a/src/libsystemd-terminal/idev.c +++ b/src/libsystemd-terminal/idev.c @@ -428,8 +428,7 @@ idev_session *idev_find_session(idev_context *c, const char *name) { return hashmap_get(c->session_map, name); } -static int session_resume_device_fn(sd_bus *bus, - sd_bus_message *signal, +static int session_resume_device_fn(sd_bus_message *signal, void *userdata, sd_bus_error *ret_error) { idev_session *s = userdata; @@ -451,8 +450,7 @@ static int session_resume_device_fn(sd_bus *bus, return 0; } -static int session_pause_device_fn(sd_bus *bus, - sd_bus_message *signal, +static int session_pause_device_fn(sd_bus_message *signal, void *userdata, sd_bus_error *ret_error) { idev_session *s = userdata; diff --git a/src/libsystemd-terminal/sysview.c b/src/libsystemd-terminal/sysview.c index 550f0305af..1e13167a79 100644 --- a/src/libsystemd-terminal/sysview.c +++ b/src/libsystemd-terminal/sysview.c @@ -271,8 +271,7 @@ sysview_seat *sysview_session_get_seat(sysview_session *session) { return session->seat; } -static int session_take_control_fn(sd_bus *bus, - sd_bus_message *reply, +static int session_take_control_fn(sd_bus_message *reply, void *userdata, sd_bus_error *ret_error) { sysview_session *session = userdata; @@ -1216,8 +1215,7 @@ static int context_ld_session_removed(sysview_context *c, sd_bus_message *signal return 0; } -static int context_ld_manager_signal_fn(sd_bus *bus, - sd_bus_message *signal, +static int context_ld_manager_signal_fn(sd_bus_message *signal, void *userdata, sd_bus_error *ret_error) { sysview_context *c = userdata; @@ -1260,8 +1258,7 @@ static void context_ld_stop(sysview_context *c) { c->ld_slot_manager_signal = sd_bus_slot_unref(c->ld_slot_manager_signal); } -static int context_ld_list_seats_fn(sd_bus *bus, - sd_bus_message *reply, +static int context_ld_list_seats_fn(sd_bus_message *reply, void *userdata, sd_bus_error *ret_error) { sysview_context *c = userdata; @@ -1313,8 +1310,7 @@ settle: return r; } -static int context_ld_list_sessions_fn(sd_bus *bus, - sd_bus_message *reply, +static int context_ld_list_sessions_fn(sd_bus_message *reply, void *userdata, sd_bus_error *ret_error) { sysview_context *c = userdata; |