diff options
author | Lennart Poettering <lennart@poettering.net> | 2015-10-26 17:30:56 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-10-27 13:25:55 +0100 |
commit | 5f311f8c0e51e2f13773823feb6a71f7c6f2838c (patch) | |
tree | 6edfc648016e7000715e11c1ede94fde32e88d82 /src/shared/install.c | |
parent | e4e73a632524c382139034d4271f53b6089ab4cb (diff) |
util: remove path_get_parent(), in favour of dirname_malloc()
We don't need two functions that do essentialy the same, hence drop
path_get_parent(), and stick to dirname_malloc(), but move it to
path-util.[ch].
Diffstat (limited to 'src/shared/install.c')
-rw-r--r-- | src/shared/install.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/shared/install.c b/src/shared/install.c index 9b72f76662..a1720488e8 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -48,13 +48,12 @@ typedef struct { static int in_search_path(const char *path, char **search) { _cleanup_free_ char *parent = NULL; - int r; assert(path); - r = path_get_parent(path, &parent); - if (r < 0) - return r; + parent = dirname_malloc(path); + if (!parent) + return -ENOMEM; return strv_contains(search, parent); } |