From 98f609368723529a98f44948569fd2eb2dd9685d Mon Sep 17 00:00:00 2001 From: Reverend Homer Date: Mon, 22 Jan 2018 18:04:44 +0300 Subject: [PATCH] systemctl: replace manual GetAll call with bus_map_all_properties() in unit_exists() --- src/systemctl/systemctl.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index e44241f..e5e3803 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -6270,22 +6270,10 @@ static int unit_exists(LookupPaths *lp, const char *unit) { if (r < 0) return r; - r = sd_bus_call_method( - bus, - "org.freedesktop.systemd1", - path, - "org.freedesktop.DBus.Properties", - "GetAll", - &error, - &reply, - "s", ""); + r = bus_map_all_properties(bus, "org.freedesktop.systemd1", path, property_map, &error, &info); if (r < 0) return log_error_errno(r, "Failed to get properties: %s", bus_error_message(&error, r)); - r = bus_message_map_all_properties(reply, property_map, &error, &info); - if (r < 0) - return log_error_errno(r, "Failed to map properties: %s", bus_error_message(&error, r)); - return !streq_ptr(info.load_state, "not-found") || !streq_ptr(info.active_state, "inactive"); } -- 2.7.4