diff options
| author | Nishal Kulkarni <nishalkulkarni@gmail.com> | 2021-12-17 22:06:31 +0530 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-12-19 09:14:07 +0900 |
| commit | a6293b0541681f1297cfd100bfbb507d5e6f0c3b (patch) | |
| tree | 25582654bffaff52bd82174a5443cfcdca3b659a /src/login/logind-session-dbus.c | |
| parent | ecb0be874d8ad32e520efc52e26756b23154e43d (diff) | |
| download | systemd-a6293b0541681f1297cfd100bfbb507d5e6f0c3b.tar.gz | |
logind: Use new macros
Migrate logind to use the new macros to declare a D-Bus method or signal.
Replaced SD_BUS_METHOD_WITH_NAMES with SD_BUS_METHOD_WITH_ARGS.
Replaced SD_BUS_SIGNAL_WITH_NAMES with SD_BUS_SIGNAL_WITH_ARGS.
Diffstat (limited to 'src/login/logind-session-dbus.c')
| -rw-r--r-- | src/login/logind-session-dbus.c | 127 |
1 files changed, 52 insertions, 75 deletions
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index afaef1123d..ff4cd0a631 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -871,86 +871,63 @@ static const sd_bus_vtable session_vtable[] = { NULL, bus_session_method_lock, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetIdleHint", - "b", - SD_BUS_PARAM(idle), - NULL,, - method_set_idle_hint, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetLockedHint", - "b", - SD_BUS_PARAM(locked), - NULL,, - method_set_locked_hint, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("Kill", - "si", - SD_BUS_PARAM(who) - SD_BUS_PARAM(signal_number), - NULL,, - bus_session_method_kill, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("TakeControl", - "b", - SD_BUS_PARAM(force), - NULL,, - method_take_control, - SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetIdleHint", + SD_BUS_ARGS("b", idle), + SD_BUS_NO_RESULT, + method_set_idle_hint, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetLockedHint", + SD_BUS_ARGS("b", locked), + SD_BUS_NO_RESULT, + method_set_locked_hint, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("Kill", + SD_BUS_ARGS("s", who, "i", signal_number), + SD_BUS_NO_RESULT, + bus_session_method_kill, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("TakeControl", + SD_BUS_ARGS("b", force), + SD_BUS_NO_RESULT, + method_take_control, + SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("ReleaseControl", NULL, NULL, method_release_control, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetType", - "s", - SD_BUS_PARAM(type), - NULL,, - method_set_type, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("TakeDevice", - "uu", - SD_BUS_PARAM(major) - SD_BUS_PARAM(minor), - "hb", - SD_BUS_PARAM(fd) - SD_BUS_PARAM(inactive), - method_take_device, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ReleaseDevice", - "uu", - SD_BUS_PARAM(major) - SD_BUS_PARAM(minor), - NULL,, - method_release_device, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("PauseDeviceComplete", - "uu", - SD_BUS_PARAM(major) - SD_BUS_PARAM(minor), - NULL,, - method_pause_device_complete, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetBrightness", - "ssu", - SD_BUS_PARAM(subsystem) - SD_BUS_PARAM(name) - SD_BUS_PARAM(brightness), - NULL,, - method_set_brightness, - SD_BUS_VTABLE_UNPRIVILEGED), - - SD_BUS_SIGNAL_WITH_NAMES("PauseDevice", - "uus", - SD_BUS_PARAM(major) - SD_BUS_PARAM(minor) - SD_BUS_PARAM(type), - 0), - SD_BUS_SIGNAL_WITH_NAMES("ResumeDevice", - "uuh", - SD_BUS_PARAM(major) - SD_BUS_PARAM(minor) - SD_BUS_PARAM(fd), - 0), + SD_BUS_METHOD_WITH_ARGS("SetType", + SD_BUS_ARGS("s", type), + SD_BUS_NO_RESULT, + method_set_type, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("TakeDevice", + SD_BUS_ARGS("u", major, "u", minor), + SD_BUS_RESULT("h", fd, "b", inactive), + method_take_device, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ReleaseDevice", + SD_BUS_ARGS("u", major, "u", minor), + SD_BUS_NO_RESULT, + method_release_device, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("PauseDeviceComplete", + SD_BUS_ARGS("u", major, "u", minor), + SD_BUS_NO_RESULT, + method_pause_device_complete, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetBrightness", + SD_BUS_ARGS("s", subsystem, "s", name, "u", brightness), + SD_BUS_NO_RESULT, + method_set_brightness, + SD_BUS_VTABLE_UNPRIVILEGED), + + SD_BUS_SIGNAL_WITH_ARGS("PauseDevice", + SD_BUS_ARGS("u", major, "u", minor, "s", type), + 0), + SD_BUS_SIGNAL_WITH_ARGS("ResumeDevice", + SD_BUS_ARGS("u", major, "u", minor, "h", fd), + 0), SD_BUS_SIGNAL("Lock", NULL, 0), SD_BUS_SIGNAL("Unlock", NULL, 0), |