From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 2 Oct 2018 10:35:37 +0000 (+0200)
Subject: pid1: remove unnecessary error reassignment
X-Git-Tag: v240~648^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c3733d5defb5428ddfeefae6d80fcbcc253e7ef;p=thirdparty%2Fsystemd.git

pid1: remove unnecessary error reassignment

LGTM was complaining:
> Comparison is always true because r >= 0.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 5baa30d3dde..c361a1ec076 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3459,9 +3459,7 @@ int manager_reload(Manager *m) {
         m->uid_refs = hashmap_free(m->uid_refs);
         m->gid_refs = hashmap_free(m->gid_refs);
 
-        q = lookup_paths_init(&m->lookup_paths, m->unit_file_scope, 0, NULL);
-        if (q < 0 && r >= 0)
-                r = q;
+        r = lookup_paths_init(&m->lookup_paths, m->unit_file_scope, 0, NULL);
 
         q = manager_run_environment_generators(m);
         if (q < 0 && r >= 0)