From 2ad1e0671b37c666877f38a9e16198789e60a443 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 23 May 2023 16:36:14 +0200 Subject: [PATCH] localed: simplify method call Also remove lines between call and result handling. --- src/locale/localed.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/locale/localed.c b/src/locale/localed.c index e08f8ac6efb..63ff69d7d3f 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -28,24 +28,14 @@ #include "user-util.h" static int reload_system_manager(sd_bus *bus) { - _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL; _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; int r; assert(bus); - r = sd_bus_message_new_method_call(bus, &m, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "Reload"); - if (r < 0) - return bus_log_create_error(r); - - r = sd_bus_call(bus, m, 0, &error, NULL); + r = bus_call_method(bus, bus_systemd_mgr, "Reload", &error, NULL, NULL); if (r < 0) return log_error_errno(r, "Failed to reload system manager: %s", bus_error_message(&error, r)); - return 0; } @@ -56,10 +46,8 @@ static int vconsole_reload(sd_bus *bus) { assert(bus); r = bus_call_method(bus, bus_systemd_mgr, "RestartUnit", &error, NULL, "ss", "systemd-vconsole-setup.service", "replace"); - if (r < 0) return log_error_errno(r, "Failed to issue method call: %s", bus_error_message(&error, r)); - return 0; } -- 2.47.3