summaryrefslogtreecommitdiff
path: root/src/core/swap.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-11 20:42:39 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-11 20:42:39 +0100
commit4c9ea260aeaff2e837f543e3c42d2e7102af1137 (patch)
treee1e6a1f6cbcb1a11c3eda17376e52fd401fcf8f9 /src/core/swap.c
parent45f06b3450174a9649a51a0b48fdbbbe98f2bb5d (diff)
core: simplify things a bit by checking default_dependencies boolean in callee, not caller
It's nicer to hide the check away in the various xyz_add_default_dependencies() calls, rather than making it explicit in the caller, and thus require deeper nesing.
Diffstat (limited to 'src/core/swap.c')
-rw-r--r--src/core/swap.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/swap.c b/src/core/swap.c
index e44cffc2e8..ee0838e676 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -213,6 +213,9 @@ static int swap_add_device_links(Swap *s) {
static int swap_add_default_dependencies(Swap *s) {
assert(s);
+ if (!UNIT(s)->default_dependencies)
+ return 0;
+
if (UNIT(s)->manager->running_as != MANAGER_SYSTEM)
return 0;
@@ -331,11 +334,9 @@ static int swap_load(Unit *u) {
if (r < 0)
return r;
- if (UNIT(s)->default_dependencies) {
- r = swap_add_default_dependencies(s);
- if (r < 0)
- return r;
- }
+ r = swap_add_default_dependencies(s);
+ if (r < 0)
+ return r;
}
return swap_verify(s);