From bc06be753346784e19151814b5b9c01c624317f2 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 1 Feb 2017 14:30:57 -0500
Subject: shared/cgroup-show: extract funtion to query unit cgroup path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…and use it where possible.
---
 src/shared/cgroup-show.c | 47 +++++++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 16 deletions(-)

(limited to 'src/shared/cgroup-show.c')

diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
index c9815f22ac..8765cf2f49 100644
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -317,6 +317,34 @@ int show_cgroup_and_extra_by_spec(
         return show_cgroup_and_extra(controller, path, prefix, n_columns, extra_pids, n_extra_pids, flags);
 }
 
+int show_cgroup_get_unit_path_and_warn(
+                sd_bus *bus,
+                const char *unit,
+                char **ret) {
+
+        _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_free_ char *path = NULL;
+        int r;
+
+        path = unit_dbus_path_from_name(unit);
+        if (!path)
+                return log_oom();
+
+        r = sd_bus_get_property_string(
+                        bus,
+                        "org.freedesktop.systemd1",
+                        path,
+                        unit_dbus_interface_from_name(unit),
+                        "ControlGroup",
+                        &error,
+                        ret);
+        if (r < 0)
+                return log_error_errno(r, "Failed to query unit control group path: %s",
+                                       bus_error_message(&error, r));
+
+        return 0;
+}
+
 int show_cgroup_get_path_and_warn(
                 const char *machine,
                 const char *prefix,
@@ -326,9 +354,8 @@ int show_cgroup_get_path_and_warn(
         _cleanup_free_ char *root = NULL;
 
         if (machine) {
-                _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
                 _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
-                _cleanup_free_ char *unit = NULL, *path = NULL;
+                _cleanup_free_ char *unit = NULL;
                 const char *m;
 
                 m = strjoina("/run/systemd/machines/", machine);
@@ -336,25 +363,13 @@ int show_cgroup_get_path_and_warn(
                 if (r < 0)
                         return log_error_errno(r, "Failed to load machine data: %m");
 
-                path = unit_dbus_path_from_name(unit);
-                if (!path)
-                        return log_oom();
-
                 r = bus_connect_transport_systemd(BUS_TRANSPORT_LOCAL, NULL, false, &bus);
                 if (r < 0)
                         return log_error_errno(r, "Failed to create bus connection: %m");
 
-                r = sd_bus_get_property_string(
-                                bus,
-                                "org.freedesktop.systemd1",
-                                path,
-                                unit_dbus_interface_from_name(unit),
-                                "ControlGroup",
-                                &error,
-                                &root);
+                r = show_cgroup_get_unit_path_and_warn(bus, unit, &root);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to query unit control group path: %s",
-                                               bus_error_message(&error, r));
+                        return r;
         } else {
                 r = cg_get_root_path(&root);
                 if (r == -ENOMEDIUM)
-- 
cgit v1.2.3-54-g00ecf