X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Floginctl.c;h=6c12556d0929bb1f231fe9f280082414be0dc195;hp=bd7ec27da42500435537949aaaddc96b8c47d702;hb=059696ac014da265ee2d1b062cd0dc7bee3d2001;hpb=f88c58a33748ad36866544b45e4fe06c506d4c31

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index bd7ec27da..6c12556d0 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -37,7 +37,7 @@
 #include "strv.h"
 #include "unit-name.h"
 #include "sysfs-show.h"
-#include "logs-show.h"
+// #include "logs-show.h"
 #include "cgroup-show.h"
 #include "cgroup-util.h"
 #include "spawn-polkit-agent.h"
@@ -266,7 +266,7 @@ static int show_unit_cgroup(sd_bus *bus, const char *interface, const char *unit
         if (isempty(cgroup))
                 return 0;
 
-        if (cg_is_empty_recursive(ELOGIND_CGROUP_CONTROLLER, cgroup, false) != 0 && leader <= 0)
+        if (cg_is_empty_recursive(ELOGIND_CGROUP_CONTROLLER, cgroup) != 0 && leader <= 0)
                 return 0;
 
         c = columns();
@@ -375,11 +375,9 @@ static int prop_map_first_of_struct(sd_bus *bus, const char *member, sd_bus_mess
                 if (r < 0)
                         return r;
 
-                free(*p);
-                *p = strdup(s);
-
-                if (!*p)
-                        return -ENOMEM;
+                r = free_and_strdup(p, s);
+                if (r < 0)
+                        return r;
         } else {
                 r = sd_bus_message_read_basic(m, contents[0], userdata);
                 if (r < 0)