Do not print invalid UTF-8 in error messages

[elogind.git] / src / core / slice.c

diff --git a/src/core/slice.c b/src/core/slice.c
index 40d416e35ee53e44088b52b4e6ce2db7e71e0004..ae9a54ba699e608d021d18c7057720ad561b0c70 100644 (file)
--- a/src/core/slice.c
+++ b/src/core/slice.c
@@ -43,6 +43,7 @@ static void slice_init(Unit *u) {
         assert(u->load_state == UNIT_STUB);
 
         cgroup_context_init(&s->cgroup_context);
+        unit_cgroup_context_init_defaults(u, &s->cgroup_context);
 }
 
 static void slice_done(Unit *u) {
@@ -216,7 +217,7 @@ static int slice_stop(Unit *u) {
         return 0;
 }
 
-static int slice_kill(Unit *u, KillWho who, int signo, DBusError *error) {
+static int slice_kill(Unit *u, KillWho who, int signo, sd_bus_error *error) {
         return unit_kill_common(u, who, signo, -1, -1, error);
 }
 
@@ -275,13 +276,13 @@ DEFINE_STRING_TABLE_LOOKUP(slice_state, SliceState);
 
 const UnitVTable slice_vtable = {
         .object_size = sizeof(Slice),
+        .cgroup_context_offset = offsetof(Slice, cgroup_context),
+
         .sections =
                 "Unit\0"
                 "Slice\0"
                 "Install\0",
-
         .private_section = "Slice",
-        .cgroup_context_offset = offsetof(Slice, cgroup_context),
 
         .no_alias = true,
         .no_instances = true,
@@ -306,7 +307,7 @@ const UnitVTable slice_vtable = {
         .sub_state_to_string = slice_sub_state_to_string,
 
         .bus_interface = "org.freedesktop.systemd1.Slice",
-        .bus_message_handler = bus_slice_message_handler,
+        .bus_vtable = bus_slice_vtable,
         .bus_set_property = bus_slice_set_property,
         .bus_commit_properties = bus_slice_commit_properties,