mirror of
https://github.com/systemd/systemd.git
synced 2025-03-25 18:50:18 +03:00
portabled: use SD_BUS_METHOD_WITH_ARGS
This commit is contained in:
Luca Boccassi
parent
3b91bae3ce
commit
598f938e3b
@ -360,18 +360,81 @@ const sd_bus_vtable manager_vtable[] = {
|
||||
SD_BUS_PROPERTY("PoolUsage", "t", property_get_pool_usage, 0, 0),
|
||||
SD_BUS_PROPERTY("PoolLimit", "t", property_get_pool_limit, 0, 0),
|
||||
SD_BUS_PROPERTY("Profiles", "as", property_get_profiles, 0, 0),
|
||||
SD_BUS_METHOD("GetImage", "s", "o", method_get_image, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("ListImages", NULL, "a(ssbtttso)", method_list_images, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("GetImageOSRelease", "s", "a{ss}", method_get_image_os_release, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("GetImageMetadata", "sas", "saya{say}", method_get_image_metadata, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("GetImageState", "s", "s", method_get_image_state, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("AttachImage", "sassbs", "a(sss)", method_attach_image, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("DetachImage", "sb", "a(sss)", method_detach_image, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("ReattachImage", "sassbs", "a(sss)a(sss)", method_reattach_image, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("RemoveImage", "s", NULL, method_remove_image, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("MarkImageReadOnly", "sb", NULL, method_mark_image_read_only, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("SetImageLimit", "st", NULL, method_set_image_limit, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("SetPoolLimit", "t", NULL, method_set_pool_limit, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("GetImage",
|
||||
SD_BUS_ARGS("s", image),
|
||||
SD_BUS_RESULT("o", object),
|
||||
method_get_image,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("ListImages",
|
||||
SD_BUS_NO_ARGS,
|
||||
SD_BUS_RESULT("a(ssbtttso)", images),
|
||||
method_list_images,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("GetImageOSRelease",
|
||||
SD_BUS_ARGS("s", image),
|
||||
SD_BUS_RESULT("a{ss}", os_release),
|
||||
method_get_image_os_release,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("GetImageMetadata",
|
||||
SD_BUS_ARGS("s", image,
|
||||
"as", matches),
|
||||
SD_BUS_RESULT("s", image,
|
||||
"ay", os_release,
|
||||
"a{say}", units),
|
||||
method_get_image_metadata,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("GetImageState",
|
||||
SD_BUS_ARGS("s", image),
|
||||
SD_BUS_RESULT("s", state),
|
||||
method_get_image_state,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("AttachImage",
|
||||
SD_BUS_ARGS("s", image,
|
||||
"as", matches,
|
||||
"s", profile,
|
||||
"b", runtime,
|
||||
"s", copy_mode),
|
||||
SD_BUS_RESULT("a(sss)", changes),
|
||||
method_attach_image,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("DetachImage",
|
||||
SD_BUS_ARGS("s", image,
|
||||
"b", runtime),
|
||||
SD_BUS_RESULT("a(sss)", changes),
|
||||
method_detach_image,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("ReattachImage",
|
||||
SD_BUS_ARGS("s", image,
|
||||
"as", matches,
|
||||
"s", profile,
|
||||
"b", runtime,
|
||||
"s", copy_mode),
|
||||
SD_BUS_RESULT("a(sss)", changes_removed,
|
||||
"a(sss)", changes_updated),
|
||||
method_reattach_image,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("RemoveImage",
|
||||
SD_BUS_ARGS("s", image),
|
||||
SD_BUS_NO_RESULT,
|
||||
method_remove_image,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("MarkImageReadOnly",
|
||||
SD_BUS_ARGS("s", image,
|
||||
"b", read_only),
|
||||
SD_BUS_NO_RESULT,
|
||||
method_mark_image_read_only,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("SetImageLimit",
|
||||
SD_BUS_ARGS("s", image,
|
||||
"t", limit),
|
||||
SD_BUS_NO_RESULT,
|
||||
method_set_image_limit,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("SetPoolLimit",
|
||||
SD_BUS_ARGS("t", limit),
|
||||
SD_BUS_NO_RESULT,
|
||||
method_set_pool_limit,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_VTABLE_END
|
||||
};
|
||||
|
||||
|
||||
@ -708,15 +708,60 @@ const sd_bus_vtable image_vtable[] = {
|
||||
SD_BUS_PROPERTY("Limit", "t", NULL, offsetof(Image, limit), 0),
|
||||
SD_BUS_PROPERTY("UsageExclusive", "t", NULL, offsetof(Image, usage_exclusive), 0),
|
||||
SD_BUS_PROPERTY("LimitExclusive", "t", NULL, offsetof(Image, limit_exclusive), 0),
|
||||
SD_BUS_METHOD("GetOSRelease", NULL, "a{ss}", bus_image_method_get_os_release, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("GetMetadata", "as", "saya{say}", bus_image_method_get_metadata, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("GetState", NULL, "s", bus_image_method_get_state, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("Attach", "assbs", "a(sss)", bus_image_method_attach, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("Detach", "b", "a(sss)", bus_image_method_detach, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("Reattach", "assbs", "a(sss)a(sss)", bus_image_method_reattach, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("Remove", NULL, NULL, bus_image_method_remove, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("MarkReadOnly", "b", NULL, bus_image_method_mark_read_only, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("SetLimit", "t", NULL, bus_image_method_set_limit, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("GetOSRelease",
|
||||
SD_BUS_NO_ARGS,
|
||||
SD_BUS_RESULT("a{ss}", os_release),
|
||||
bus_image_method_get_os_release,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("GetMetadata",
|
||||
SD_BUS_ARGS("as", matches),
|
||||
SD_BUS_RESULT("s", image,
|
||||
"ay", os_release,
|
||||
"a{say}", units),
|
||||
bus_image_method_get_metadata,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("GetState",
|
||||
SD_BUS_NO_ARGS,
|
||||
SD_BUS_RESULT("s", state),
|
||||
bus_image_method_get_state,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("Attach",
|
||||
SD_BUS_ARGS("as", matches,
|
||||
"s", profile,
|
||||
"b", runtime,
|
||||
"s", copy_mode),
|
||||
SD_BUS_RESULT("a(sss)", changes),
|
||||
bus_image_method_attach,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("Detach",
|
||||
SD_BUS_ARGS("b", runtime),
|
||||
SD_BUS_RESULT("a(sss)", changes),
|
||||
bus_image_method_detach,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("Reattach",
|
||||
SD_BUS_ARGS("as", matches,
|
||||
"s", profile,
|
||||
"b", runtime,
|
||||
"s", copy_mode),
|
||||
SD_BUS_RESULT("a(sss)", changes_removed,
|
||||
"a(sss)", changes_updated),
|
||||
bus_image_method_reattach,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("Remove",
|
||||
SD_BUS_NO_ARGS,
|
||||
SD_BUS_NO_RESULT,
|
||||
bus_image_method_remove,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("MarkReadOnly",
|
||||
SD_BUS_ARGS("b", read_only),
|
||||
SD_BUS_NO_RESULT,
|
||||
bus_image_method_mark_read_only,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_ARGS("SetLimit",
|
||||
SD_BUS_ARGS("t", limit),
|
||||
SD_BUS_NO_RESULT,
|
||||
bus_image_method_set_limit,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_VTABLE_END
|
||||
};
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user