timedate: update to use new-style sd-bus macros

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index c28615cf5e634826160af70b16deb528c2f80c0d..9ca5d37b75ef507e667ec92f855a1a7b53bd914c 100644 (file)
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -1049,42 +1049,31 @@ static const sd_bus_vtable timedate_vtable[] = {
         SD_BUS_PROPERTY("TimeUSec", "t", property_get_time, 0, 0),
         SD_BUS_PROPERTY("RTCTimeUSec", "t", property_get_rtc_time, 0, 0),
 
-        SD_BUS_METHOD_WITH_NAMES("SetTime",
-                                 "xbb",
-                                 SD_BUS_PARAM(usec_utc)
-                                 SD_BUS_PARAM(relative)
-                                 SD_BUS_PARAM(interactive),
-                                 NULL,,
-                                 method_set_time,
-                                 SD_BUS_VTABLE_UNPRIVILEGED),
-        SD_BUS_METHOD_WITH_NAMES("SetTimezone",
-                                 "sb",
-                                 SD_BUS_PARAM(timezone)
-                                 SD_BUS_PARAM(interactive),
-                                 NULL,,
-                                 method_set_timezone,
-                                 SD_BUS_VTABLE_UNPRIVILEGED),
-        SD_BUS_METHOD_WITH_NAMES("SetLocalRTC",
-                                 "bbb",
-                                 SD_BUS_PARAM(local_rtc)
-                                 SD_BUS_PARAM(fix_system)
-                                 SD_BUS_PARAM(interactive),
-                                 NULL,,
-                                 method_set_local_rtc,
-                                 SD_BUS_VTABLE_UNPRIVILEGED),
-        SD_BUS_METHOD_WITH_NAMES("SetNTP",
-                                 "bb",
-                                 SD_BUS_PARAM(use_ntp)
-                                 SD_BUS_PARAM(interactive),
-                                 NULL,,
-                                 method_set_ntp,
-                                 SD_BUS_VTABLE_UNPRIVILEGED),
-        SD_BUS_METHOD_WITH_NAMES("ListTimezones",
-                                 NULL,,
-                                 "as",
-                                 SD_BUS_PARAM(timezones),
-                                 method_list_timezones,
-                                 SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD_WITH_ARGS("SetTime",
+                                SD_BUS_ARGS("x", usec_utc, "b", relative, "b", interactive),
+                                SD_BUS_NO_RESULT,
+                                method_set_time,
+                                SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD_WITH_ARGS("SetTimezone",
+                                SD_BUS_ARGS("s", timezone, "b", interactive),
+                                SD_BUS_NO_RESULT,
+                                method_set_timezone,
+                                SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD_WITH_ARGS("SetLocalRTC",
+                                SD_BUS_ARGS("b", local_rtc, "b", fix_system, "b", interactive),
+                                SD_BUS_NO_RESULT,
+                                method_set_local_rtc,
+                                SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD_WITH_ARGS("SetNTP",
+                                SD_BUS_ARGS("b", use_ntp, "b", interactive),
+                                SD_BUS_NO_RESULT,
+                                method_set_ntp,
+                                SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD_WITH_ARGS("ListTimezones",
+                                SD_BUS_NO_ARGS,
+                                SD_BUS_RESULT("as", timezones),
+                                method_list_timezones,
+                                SD_BUS_VTABLE_UNPRIVILEGED),
 
         SD_BUS_VTABLE_END,
 };