summaryrefslogtreecommitdiff
path: root/src/core/slice.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-10 20:36:37 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-10 21:03:49 +0100
commitba64af90ecf48f7653a04bf3af1291385c9a69b8 (patch)
tree855c8d714b9bbaf40a3af73c1341b6553f35c19e /src/core/slice.c
parent1e603a482f57edb1fb863dbf23b868cf5854e004 (diff)
core: change return value of the unit's enumerate() call to void
We cannot handle enumeration failures in a sensible way, hence let's try hard to continue without making such failures fatal, and log about it with precise error messages.
Diffstat (limited to 'src/core/slice.c')
-rw-r--r--src/core/slice.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/slice.c b/src/core/slice.c
index 4602144150..2aa3fbf8be 100644
--- a/src/core/slice.c
+++ b/src/core/slice.c
@@ -255,7 +255,7 @@ _pure_ static const char *slice_sub_state_to_string(Unit *u) {
return slice_state_to_string(SLICE(u)->state);
}
-static int slice_enumerate(Manager *m) {
+static void slice_enumerate(Manager *m) {
Unit *u;
int r;
@@ -264,13 +264,16 @@ static int slice_enumerate(Manager *m) {
u = manager_get_unit(m, SPECIAL_ROOT_SLICE);
if (!u) {
u = unit_new(m, sizeof(Slice));
- if (!u)
- return log_oom();
+ if (!u) {
+ log_oom();
+ return;
+ }
r = unit_add_name(u, SPECIAL_ROOT_SLICE);
if (r < 0) {
unit_free(u);
- return log_error_errno(r, "Failed to add -.slice name");
+ log_error_errno(r, "Failed to add -.slice name");
+ return;
}
}
@@ -288,8 +291,6 @@ static int slice_enumerate(Manager *m) {
unit_add_to_load_queue(u);
unit_add_to_dbus_queue(u);
-
- return 0;
}
const UnitVTable slice_vtable = {