From: OMOJOLA JOSHUA <109356020+1awesomeJ@users.noreply.github.com>
Date: Wed, 15 Mar 2023 22:52:24 +0000 (+0100)
Subject: updated usage of SD_BUS_METHOD_WITH_NAMES macros to SD_BUS_METHOD_WIT… (#26840)
X-Git-Tag: v254-rc1~1006
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71243af72fb7ec29a06c249d87ae1a04ddd11a3e;p=thirdparty%2Fsystemd.git

updated usage of SD_BUS_METHOD_WITH_NAMES macros to SD_BUS_METHOD_WIT… (#26840)

* localed: update usage of SD_BUS_METHOD_WITH_NAMES macros to SD_BUS_METHOD_WITH_ARGS
---

diff --git a/src/locale/localed.c b/src/locale/localed.c
index 2f23eab92ba..ec5b78a1906 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -715,33 +715,21 @@ static const sd_bus_vtable locale_vtable[] = {
         SD_BUS_PROPERTY("VConsoleKeymap", "s", property_get_vconsole, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_PROPERTY("VConsoleKeymapToggle", "s", property_get_vconsole, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
 
-        SD_BUS_METHOD_WITH_NAMES("SetLocale",
-                                 "asb",
-                                 SD_BUS_PARAM(locale)
-                                 SD_BUS_PARAM(interactive),
-                                 NULL,,
-                                 method_set_locale,
-                                 SD_BUS_VTABLE_UNPRIVILEGED),
-        SD_BUS_METHOD_WITH_NAMES("SetVConsoleKeyboard",
-                                 "ssbb",
-                                 SD_BUS_PARAM(keymap)
-                                 SD_BUS_PARAM(keymap_toggle)
-                                 SD_BUS_PARAM(convert)
-                                 SD_BUS_PARAM(interactive),
-                                 NULL,,
-                                 method_set_vc_keyboard,
-                                 SD_BUS_VTABLE_UNPRIVILEGED),
-        SD_BUS_METHOD_WITH_NAMES("SetX11Keyboard",
-                                 "ssssbb",
-                                 SD_BUS_PARAM(layout)
-                                 SD_BUS_PARAM(model)
-                                 SD_BUS_PARAM(variant)
-                                 SD_BUS_PARAM(options)
-                                 SD_BUS_PARAM(convert)
-                                 SD_BUS_PARAM(interactive),
-                                 NULL,,
-                                 method_set_x11_keyboard,
-                                 SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD_WITH_ARGS("SetLocale",
+                                SD_BUS_ARGS("as", locale, "b", interactive),
+                                SD_BUS_NO_RESULT,
+                                method_set_locale,
+                                SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD_WITH_ARGS("SetVConsoleKeyboard",
+                                SD_BUS_ARGS("s", keymap, "s", keymap_toggle, "b", convert, "b", interactive),
+                                SD_BUS_NO_RESULT,
+                                method_set_vc_keyboard,
+                                SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD_WITH_ARGS("SetX11Keyboard",
+                                SD_BUS_ARGS("s", layout, "s", model, "s", variant, "s", options, "b", convert, "b", interactive),
+                                SD_BUS_NO_RESULT,
+                                method_set_x11_keyboard,
+                                SD_BUS_VTABLE_UNPRIVILEGED),
 
         SD_BUS_VTABLE_END
 };