chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove support for auto-spawning VTs
[elogind.git]
/
src
/
login
/
loginctl.c
diff --git
a/src/login/loginctl.c
b/src/login/loginctl.c
index c44209fe04106e7affd54d868af026be000b75ea..6c12556d0929bb1f231fe9f280082414be0dc195 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 "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"
#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 (isempty(cgroup))
return 0;
- if (cg_is_empty_recursive(
SYSTEMD_CGROUP_CONTROLLER, cgroup, false
) != 0 && leader <= 0)
+ if (cg_is_empty_recursive(
ELOGIND_CGROUP_CONTROLLER, cgroup
) != 0 && leader <= 0)
return 0;
c = columns();
return 0;
c = columns();
@@
-275,7
+275,7
@@
static int show_unit_cgroup(sd_bus *bus, const char *interface, const char *unit
else
c = 0;
else
c = 0;
- show_cgroup_and_extra(
SYSTEM
D_CGROUP_CONTROLLER, cgroup, "\t\t ", c, false, &leader, leader > 0, get_output_flags());
+ show_cgroup_and_extra(
ELOGIN
D_CGROUP_CONTROLLER, cgroup, "\t\t ", c, false, &leader, leader > 0, get_output_flags());
return 0;
}
return 0;
}
@@
-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;
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)
} else {
r = sd_bus_message_read_basic(m, contents[0], userdata);
if (r < 0)