From 43fe4f761315d576da7d646daee005896ec23cae Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Sun, 3 May 2020 00:03:16 -0700 Subject: [PATCH] timedate: switch to BusLocator-oriented helpers Mechanical substitution reducing some verbosity --- src/timedate/timedatectl.c | 85 +++++++++----------------------------- src/timedate/timedated.c | 34 ++++----------- 2 files changed, 29 insertions(+), 90 deletions(-) diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 8496224848..9c9791c706 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -239,14 +239,13 @@ static int set_time(int argc, char **argv, void *userdata) { if (r < 0) return log_error_errno(r, "Failed to parse time specification '%s': %m", argv[1]); - r = sd_bus_call_method(bus, - "org.freedesktop.timedate1", - "/org/freedesktop/timedate1", - "org.freedesktop.timedate1", - "SetTime", - &error, - NULL, - "xbb", (int64_t) t, relative, interactive); + r = bus_call_method( + bus, + bus_timedate, + "SetTime", + &error, + NULL, + "xbb", (int64_t) t, relative, interactive); if (r < 0) return log_error_errno(r, "Failed to set time: %s", bus_error_message(&error, r)); @@ -260,14 +259,7 @@ static int set_timezone(int argc, char **argv, void *userdata) { polkit_agent_open_if_enabled(arg_transport, arg_ask_password); - r = sd_bus_call_method(bus, - "org.freedesktop.timedate1", - "/org/freedesktop/timedate1", - "org.freedesktop.timedate1", - "SetTimezone", - &error, - NULL, - "sb", argv[1], arg_ask_password); + r = bus_call_method(bus, bus_timedate, "SetTimezone", &error, NULL, "sb", argv[1], arg_ask_password); if (r < 0) return log_error_errno(r, "Failed to set time zone: %s", bus_error_message(&error, r)); @@ -285,14 +277,13 @@ static int set_local_rtc(int argc, char **argv, void *userdata) { if (b < 0) return log_error_errno(b, "Failed to parse local RTC setting '%s': %m", argv[1]); - r = sd_bus_call_method(bus, - "org.freedesktop.timedate1", - "/org/freedesktop/timedate1", - "org.freedesktop.timedate1", - "SetLocalRTC", - &error, - NULL, - "bbb", b, arg_adjust_system_clock, arg_ask_password); + r = bus_call_method( + bus, + bus_timedate, + "SetLocalRTC", + &error, + NULL, + "bbb", b, arg_adjust_system_clock, arg_ask_password); if (r < 0) return log_error_errno(r, "Failed to set local RTC: %s", bus_error_message(&error, r)); @@ -310,14 +301,7 @@ static int set_ntp(int argc, char **argv, void *userdata) { if (b < 0) return log_error_errno(b, "Failed to parse NTP setting '%s': %m", argv[1]); - r = sd_bus_call_method(bus, - "org.freedesktop.timedate1", - "/org/freedesktop/timedate1", - "org.freedesktop.timedate1", - "SetNTP", - &error, - NULL, - "bb", b, arg_ask_password); + r = bus_call_method(bus, bus_timedate, "SetNTP", &error, NULL, "bb", b, arg_ask_password); if (r < 0) return log_error_errno(r, "Failed to set ntp: %s", bus_error_message(&error, r)); @@ -331,14 +315,7 @@ static int list_timezones(int argc, char **argv, void *userdata) { int r; char** zones; - r = sd_bus_call_method(bus, - "org.freedesktop.timedate1", - "/org/freedesktop/timedate1", - "org.freedesktop.timedate1", - "ListTimezones", - &error, - &reply, - NULL); + r = bus_call_method(bus, bus_timedate, "ListTimezones", &error, &reply, NULL); if (r < 0) return log_error_errno(r, "Failed to request list of time zones: %s", bus_error_message(&error, r)); @@ -843,15 +820,7 @@ static int parse_ifindex_bus(sd_bus *bus, const char *str) { return r; assert(r < 0); - r = sd_bus_call_method( - bus, - "org.freedesktop.network1", - "/org/freedesktop/network1", - "org.freedesktop.network1.Manager", - "GetLinkByName", - &error, - &reply, - "s", str); + r = bus_call_method(bus, bus_network_mgr, "GetLinkByName", &error, &reply, "s", str); if (r < 0) return log_error_errno(r, "Failed to get ifindex of interfaces %s: %s", str, bus_error_message(&error, r)); @@ -876,13 +845,7 @@ static int verb_ntp_servers(int argc, char **argv, void *userdata) { polkit_agent_open_if_enabled(arg_transport, arg_ask_password); - r = sd_bus_message_new_method_call( - bus, - &req, - "org.freedesktop.network1", - "/org/freedesktop/network1", - "org.freedesktop.network1.Manager", - "SetLinkNTP"); + r = bus_message_new_method_call(bus, &req, bus_network_mgr, "SetLinkNTP"); if (r < 0) return bus_log_create_error(r); @@ -914,15 +877,7 @@ static int verb_revert(int argc, char **argv, void *userdata) { polkit_agent_open_if_enabled(arg_transport, arg_ask_password); - r = sd_bus_call_method( - bus, - "org.freedesktop.network1", - "/org/freedesktop/network1", - "org.freedesktop.network1.Manager", - "RevertLinkNTP", - &error, - NULL, - "i", ifindex); + r = bus_call_method(bus, bus_network_mgr, "RevertLinkNTP", &error, NULL, "i", ifindex); if (r < 0) return log_error_errno(r, "Failed to revert interface configuration: %s", bus_error_message(&error, r)); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 19e51b063a..da59dd3314 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -471,11 +471,9 @@ static int unit_start_or_stop(UnitStatusInfo *u, sd_bus *bus, sd_bus_error *erro assert(bus); assert(error); - r = sd_bus_call_method( + r = bus_call_method( bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", + bus_systemd_mgr, start ? "StartUnit" : "StopUnit", error, &reply, @@ -515,11 +513,9 @@ static int unit_enable_or_disable(UnitStatusInfo *u, sd_bus *bus, sd_bus_error * log_unit_info(u, "%s unit.", enable ? "Enabling" : "Disabling"); if (enable) - r = sd_bus_call_method( + r = bus_call_method( bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", + bus_systemd_mgr, "EnableUnitFiles", error, NULL, @@ -527,11 +523,9 @@ static int unit_enable_or_disable(UnitStatusInfo *u, sd_bus *bus, sd_bus_error * u->name, false, true); else - r = sd_bus_call_method( + r = bus_call_method( bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", + bus_systemd_mgr, "DisableUnitFiles", error, NULL, @@ -541,15 +535,7 @@ static int unit_enable_or_disable(UnitStatusInfo *u, sd_bus *bus, sd_bus_error * if (r < 0) return r; - r = sd_bus_call_method( - bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "Reload", - error, - NULL, - NULL); + r = bus_call_method(bus, bus_systemd_mgr, "Reload", error, NULL, NULL); if (r < 0) return r; @@ -952,12 +938,10 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error u->path = mfree(u->path); if (!c->slot_job_removed) { - r = sd_bus_match_signal_async( + r = bus_match_signal_async( bus, &slot, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", + bus_systemd_mgr, "JobRemoved", match_job_removed, NULL, c); if (r < 0)