Prep v225: Applying various fixes and changes to src/login that got lost during git...

[elogind.git] / src / login / loginctl.c

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index bd7ec27da42500435537949aaaddc96b8c47d702..cf4ca46631c629f2fdc0a37793a6a9ef481e3089 100644 (file)
--- 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"
@@ -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)