mirror of
https://github.com/Dasharo/systemd.git
synced 2026-03-06 15:02:31 -08:00
core: update to use new-style sd-bus macros
Replace old SD_BUS_METHOD_WITH_NAMES and SD_BUS_SIGNAL_WITH_NAMES macros to the new SD_BUS_METHOD_WITH_ARGS and SD_BUS_SIGNAL_WITH_ARGS macros.
This commit is contained in:
amarjargal
Yu Watanabe
File diff suppressed because it is too large
Load Diff
@@ -247,24 +247,15 @@ const sd_bus_vtable bus_service_vtable[] = {
|
||||
BUS_EXEC_COMMAND_LIST_VTABLE("ExecStopPost", offsetof(Service, exec_command[SERVICE_EXEC_STOP_POST]), SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION),
|
||||
BUS_EXEC_EX_COMMAND_LIST_VTABLE("ExecStopPostEx", offsetof(Service, exec_command[SERVICE_EXEC_STOP_POST]), SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION),
|
||||
|
||||
SD_BUS_METHOD_WITH_NAMES("BindMount",
|
||||
"ssbb",
|
||||
SD_BUS_PARAM(source)
|
||||
SD_BUS_PARAM(destination)
|
||||
SD_BUS_PARAM(read_only)
|
||||
SD_BUS_PARAM(mkdir),
|
||||
NULL,,
|
||||
bus_service_method_bind_mount,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("BindMount",
|
||||
SD_BUS_ARGS("s", source, "s", destination, "b", read_only, "b", mkdir),
|
||||
SD_BUS_NO_RESULT,
|
||||
bus_service_method_bind_mount,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
|
||||
SD_BUS_METHOD_WITH_NAMES("MountImage",
|
||||
"ssbba(ss)",
|
||||
SD_BUS_PARAM(source)
|
||||
SD_BUS_PARAM(destination)
|
||||
SD_BUS_PARAM(read_only)
|
||||
SD_BUS_PARAM(mkdir)
|
||||
SD_BUS_PARAM(options),
|
||||
NULL,,
|
||||
SD_BUS_METHOD_WITH_ARGS("MountImage",
|
||||
SD_BUS_ARGS("s", source, "s", destination, "b", read_only, "b", mkdir, "a(ss)", options),
|
||||
SD_BUS_NO_RESULT,
|
||||
bus_service_method_mount_image,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
|
||||
|
||||
@@ -951,87 +951,61 @@ const sd_bus_vtable bus_unit_vtable[] = {
|
||||
SD_BUS_PROPERTY("CollectMode", "s", property_get_collect_mode, offsetof(Unit, collect_mode), SD_BUS_VTABLE_PROPERTY_CONST),
|
||||
SD_BUS_PROPERTY("Refs", "as", property_get_refs, 0, 0),
|
||||
|
||||
SD_BUS_METHOD_WITH_NAMES("Start",
|
||||
"s",
|
||||
SD_BUS_PARAM(mode),
|
||||
"o",
|
||||
SD_BUS_PARAM(job),
|
||||
bus_unit_method_start,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("Stop",
|
||||
"s",
|
||||
SD_BUS_PARAM(mode),
|
||||
"o",
|
||||
SD_BUS_PARAM(job),
|
||||
bus_unit_method_stop,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("Reload",
|
||||
"s",
|
||||
SD_BUS_PARAM(mode),
|
||||
"o",
|
||||
SD_BUS_PARAM(job),
|
||||
bus_unit_method_reload,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("Restart",
|
||||
"s",
|
||||
SD_BUS_PARAM(mode),
|
||||
"o",
|
||||
SD_BUS_PARAM(job),
|
||||
bus_unit_method_restart,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("TryRestart",
|
||||
"s",
|
||||
SD_BUS_PARAM(mode),
|
||||
"o",
|
||||
SD_BUS_PARAM(job),
|
||||
bus_unit_method_try_restart,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("ReloadOrRestart",
|
||||
"s",
|
||||
SD_BUS_PARAM(mode),
|
||||
"o",
|
||||
SD_BUS_PARAM(job),
|
||||
bus_unit_method_reload_or_restart,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("ReloadOrTryRestart",
|
||||
"s",
|
||||
SD_BUS_PARAM(mode),
|
||||
"o",
|
||||
SD_BUS_PARAM(job),
|
||||
bus_unit_method_reload_or_try_restart,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("EnqueueJob",
|
||||
"ss",
|
||||
SD_BUS_PARAM(job_type)
|
||||
SD_BUS_PARAM(job_mode),
|
||||
"uososa(uosos)",
|
||||
SD_BUS_PARAM(job_id)
|
||||
SD_BUS_PARAM(job_path)
|
||||
SD_BUS_PARAM(unit_id)
|
||||
SD_BUS_PARAM(unit_path)
|
||||
SD_BUS_PARAM(job_type)
|
||||
SD_BUS_PARAM(affected_jobs),
|
||||
bus_unit_method_enqueue_job,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("Kill",
|
||||
"si",
|
||||
SD_BUS_PARAM(whom)
|
||||
SD_BUS_PARAM(signal),
|
||||
NULL,,
|
||||
bus_unit_method_kill,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("Start",
|
||||
SD_BUS_ARGS("s", mode),
|
||||
SD_BUS_RESULT("o", job),
|
||||
bus_unit_method_start,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("Stop",
|
||||
SD_BUS_ARGS("s", mode),
|
||||
SD_BUS_RESULT("o", job),
|
||||
bus_unit_method_stop,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("Reload",
|
||||
SD_BUS_ARGS("s", mode),
|
||||
SD_BUS_RESULT("o", job),
|
||||
bus_unit_method_reload,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("Restart",
|
||||
SD_BUS_ARGS("s", mode),
|
||||
SD_BUS_RESULT("o", job),
|
||||
bus_unit_method_restart,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("TryRestart",
|
||||
SD_BUS_ARGS("s", mode),
|
||||
SD_BUS_RESULT("o", job),
|
||||
bus_unit_method_try_restart,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("ReloadOrRestart",
|
||||
SD_BUS_ARGS("s", mode),
|
||||
SD_BUS_RESULT("o", job),
|
||||
bus_unit_method_reload_or_restart,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("ReloadOrTryRestart",
|
||||
SD_BUS_ARGS("s", mode),
|
||||
SD_BUS_RESULT("o", job),
|
||||
bus_unit_method_reload_or_try_restart,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("EnqueueJob",
|
||||
SD_BUS_ARGS("s", job_type, "s", job_mode),
|
||||
SD_BUS_RESULT("u", job_id, "o", job_path, "s", unit_id, "o", unit_path, "s", job_type, "a(uosos)", affected_jobs),
|
||||
bus_unit_method_enqueue_job,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("Kill",
|
||||
SD_BUS_ARGS("s", whom, "i", signal),
|
||||
SD_BUS_NO_RESULT,
|
||||
bus_unit_method_kill,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("ResetFailed",
|
||||
NULL,
|
||||
NULL,
|
||||
bus_unit_method_reset_failed,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("SetProperties",
|
||||
"ba(sv)",
|
||||
SD_BUS_PARAM(runtime)
|
||||
SD_BUS_PARAM(properties),
|
||||
NULL,,
|
||||
bus_unit_method_set_properties,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("SetProperties",
|
||||
SD_BUS_ARGS("b", runtime, "a(sv)", properties),
|
||||
SD_BUS_NO_RESULT,
|
||||
bus_unit_method_set_properties,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("Ref",
|
||||
NULL,
|
||||
NULL,
|
||||
@@ -1042,12 +1016,11 @@ const sd_bus_vtable bus_unit_vtable[] = {
|
||||
NULL,
|
||||
bus_unit_method_unref,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("Clean",
|
||||
"as",
|
||||
SD_BUS_PARAM(mask),
|
||||
NULL,,
|
||||
bus_unit_method_clean,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("Clean",
|
||||
SD_BUS_ARGS("as", mask),
|
||||
SD_BUS_NO_RESULT,
|
||||
bus_unit_method_clean,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("Freeze",
|
||||
NULL,
|
||||
NULL,
|
||||
@@ -1600,18 +1573,15 @@ const sd_bus_vtable bus_unit_cgroup_vtable[] = {
|
||||
SD_BUS_PROPERTY("IOWriteBytes", "t", property_get_io_counter, 0, 0),
|
||||
SD_BUS_PROPERTY("IOWriteOperations", "t", property_get_io_counter, 0, 0),
|
||||
|
||||
SD_BUS_METHOD_WITH_NAMES("GetProcesses",
|
||||
NULL,,
|
||||
"a(sus)",
|
||||
SD_BUS_PARAM(processes),
|
||||
SD_BUS_METHOD_WITH_ARGS("GetProcesses",
|
||||
SD_BUS_NO_ARGS,
|
||||
SD_BUS_ARGS("a(sus)", processes),
|
||||
bus_unit_method_get_processes,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
|
||||
SD_BUS_METHOD_WITH_NAMES("AttachProcesses",
|
||||
"sau",
|
||||
SD_BUS_PARAM(subcgroup)
|
||||
SD_BUS_PARAM(pids),
|
||||
NULL,,
|
||||
SD_BUS_METHOD_WITH_ARGS("AttachProcesses",
|
||||
SD_BUS_ARGS("s", subcgroup, "au", pids),
|
||||
SD_BUS_NO_RESULT,
|
||||
bus_unit_method_attach_processes,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
|
||||
|
||||
Reference in New Issue
Block a user