From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 11 Oct 2019 09:10:50 +0000 (+0200)
Subject: core: simplify unit_load() a bit
X-Git-Tag: v244~235^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3784a7d78df9c8f50ce6d14642cf37d412edcc6;p=platform%2Fupstream%2Fsystemd.git

core: simplify unit_load() a bit

Now all unit types define .load. But even if it wasn't defined, we'd need
to call unit_load_fragment_and_dropin() anyway, so this code would not have
worked correctly.

Also, unit_load_fragment_and_dropin() either returns -ENOENT or changes
UNIT_STUB to UNIT_LOADED, so we don't need to repeat this here.
---

diff --git a/src/core/unit.c b/src/core/unit.c
index 30636dc..58c99d9 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1542,16 +1542,11 @@ int unit_load(Unit *u) {
                 u->fragment_mtime = now(CLOCK_REALTIME);
         }
 
-        if (UNIT_VTABLE(u)->load) {
-                r = UNIT_VTABLE(u)->load(u);
-                if (r < 0)
-                        goto fail;
-        }
-
-        if (u->load_state == UNIT_STUB) {
-                r = -ENOENT;
+        r = UNIT_VTABLE(u)->load(u);
+        if (r < 0)
                 goto fail;
-        }
+
+        assert(u->load_state != UNIT_STUB);
 
         if (u->load_state == UNIT_LOADED) {
                 unit_add_to_target_deps_queue(u);