From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 24 Feb 2016 20:47:54 +0000 (+0100)
Subject: install: change in_search_path() to take a LookupPaths structure
X-Git-Tag: v230~185^2~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=32c0ed7bbb94037a50c267f25071522dc8eb3e68;p=thirdparty%2Fsystemd.git

install: change in_search_path() to take a LookupPaths structure

Similar to the other calls that operate on the collected path data.
---

diff --git a/src/shared/install.c b/src/shared/install.c
index e0846c9fbfe..464b0d3a40b 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -65,7 +65,7 @@ typedef struct {
         OrderedHashmap *have_processed;
 } InstallContext;
 
-static int in_search_path(const char *path, char **search) {
+static int in_search_path(const LookupPaths *p, const char *path) {
         _cleanup_free_ char *parent = NULL;
         char **i;
 
@@ -75,7 +75,7 @@ static int in_search_path(const char *path, char **search) {
         if (!parent)
                 return -ENOMEM;
 
-        STRV_FOREACH(i, search)
+        STRV_FOREACH(i, p->search_path)
                 if (path_equal(parent, *i))
                         return true;
 
@@ -1294,7 +1294,7 @@ static int install_info_symlink_link(
         assert(config_path);
         assert(i->path);
 
-        r = in_search_path(i->path, paths->search_path);
+        r = in_search_path(paths, i->path);
         if (r != 0)
                 return r;
 
@@ -1622,7 +1622,7 @@ int unit_file_link(
                 if (!S_ISREG(st.st_mode))
                         return -ENOTTY;
 
-                q = in_search_path(*i, paths.search_path);
+                q = in_search_path(&paths, *i);
                 if (q < 0)
                         return q;
                 if (q > 0)