diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-11-11 02:31:29 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-11-11 02:31:29 +0100 |
| commit | 7042fc14ff2bd30648aea6602c95d3cf6946e7be (patch) | |
| tree | 9990f79bfe80bb0b9c8c6da94f62d66d5c7da97e /src/core/scope.c | |
| parent | Merge pull request #1839 from evverx/fix-systemctl-cancel (diff) | |
| parent | tmpfiles: don't consider it a problem if quota is not enabled on btrfs (diff) | |
| download | systemd-7042fc14ff2bd30648aea6602c95d3cf6946e7be.tar.xz systemd-7042fc14ff2bd30648aea6602c95d3cf6946e7be.zip | |
Merge pull request #1837 from poettering/grabbag2
variety of fixes
Diffstat (limited to 'src/core/scope.c')
| -rw-r--r-- | src/core/scope.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/scope.c b/src/core/scope.c index c83530a1b0..8d6149aab0 100644 --- a/src/core/scope.c +++ b/src/core/scope.c @@ -509,7 +509,7 @@ _pure_ static const char *scope_sub_state_to_string(Unit *u) { return scope_state_to_string(SCOPE(u)->state); } -static int scope_enumerate(Manager *m) { +static void scope_enumerate(Manager *m) { Unit *u; int r; @@ -523,13 +523,16 @@ static int scope_enumerate(Manager *m) { u = manager_get_unit(m, SPECIAL_INIT_SCOPE); if (!u) { u = unit_new(m, sizeof(Scope)); - if (!u) - return log_oom(); + if (!u) { + log_oom(); + return; + } r = unit_add_name(u, SPECIAL_INIT_SCOPE); if (r < 0) { unit_free(u); - return log_error_errno(r, "Failed to add init.scope name"); + log_error_errno(r, "Failed to add init.scope name"); + return; } } @@ -550,8 +553,6 @@ static int scope_enumerate(Manager *m) { unit_add_to_load_queue(u); unit_add_to_dbus_queue(u); - - return 0; } static const char* const scope_result_table[_SCOPE_RESULT_MAX] = { |