From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 8 Apr 2016 15:58:53 +0000 (+0200)
Subject: install: simplify skip_root() a bit
X-Git-Tag: v230~185^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f9364f98b3816ac90308b198030ba958757bb9b;p=thirdparty%2Fsystemd.git

install: simplify skip_root() a bit

Exit early, so that we can get rid of the large if block.
---

diff --git a/src/shared/install.c b/src/shared/install.c
index 3d48f612f3c..3289b51f41d 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -85,25 +85,27 @@ static int in_search_path(const LookupPaths *p, const char *path) {
 }
 
 static const char* skip_root(const LookupPaths *p, const char *path) {
-        if (p->root_dir) {
-                char *e;
+        char *e;
 
-                e = path_startswith(path, p->root_dir);
-                if (!e)
-                        return NULL;
+        assert(p);
+        assert(path);
 
-                /* Make sure the returned path starts with a slash */
-                if (e[0] != '/') {
-                        if (e == path || e[-1] != '/')
-                                return NULL;
+        if (!p->root_dir)
+                return path;
 
-                        e--;
-                }
+        e = path_startswith(path, p->root_dir);
+        if (!e)
+                return NULL;
+
+        /* Make sure the returned path starts with a slash */
+        if (e[0] != '/') {
+                if (e == path || e[-1] != '/')
+                        return NULL;
 
-                return e;
+                e--;
         }
 
-        return path;
+        return e;
 }
 
 static int path_is_generator(const LookupPaths *p, const char *path) {