]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
install: change in_search_path() to take a LookupPaths structure
authorLennart Poettering <lennart@poettering.net>
Wed, 24 Feb 2016 20:47:54 +0000 (21:47 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 12 Apr 2016 11:43:30 +0000 (13:43 +0200)
Similar to the other calls that operate on the collected path data.

src/shared/install.c

index e0846c9fbfe2769bb8e3e6a3917d3213494a88e3..464b0d3a40b45ce7e8fda2dd69e296ec768e4b1f 100644 (file)
@@ -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)