diff options
| author | Michael Marineau <michael.marineau@coreos.com> | 2014-06-19 19:07:02 -0700 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-06-20 00:10:46 -0400 |
| commit | 7d8da2c9641c584ff977493eeb8148300dce8759 (patch) | |
| tree | cfdc04f242639527e0fd98d0f6b66c96b58d12ba /src/shared/path-lookup.c | |
| parent | a2ae516a25dafe41e0cd296ab7b5d022fa62b95f (diff) | |
shared: rename path_strv_canonicalize_absolute functions
Since 12ed81d9 path_strv_canonicalize_absolute leaves the search list
relative to the given root directory instead of resolving paths to their
true location as the name implies. To better reflect this behavior
rename to the less strongly worded path_strv_resolve.
Diffstat (limited to 'src/shared/path-lookup.c')
| -rw-r--r-- | src/shared/path-lookup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index e072fd6092..e0aaf4431f 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -284,7 +284,7 @@ int lookup_paths_init( } } - if (!path_strv_canonicalize_absolute_uniq(p->unit_path, root_dir)) + if (!path_strv_resolve_uniq(p->unit_path, root_dir)) return -ENOMEM; if (!strv_isempty(p->unit_path)) { @@ -338,10 +338,10 @@ int lookup_paths_init( return -ENOMEM; } - if (!path_strv_canonicalize_absolute_uniq(p->sysvinit_path, root_dir)) + if (!path_strv_resolve_uniq(p->sysvinit_path, root_dir)) return -ENOMEM; - if (!path_strv_canonicalize_absolute_uniq(p->sysvrcnd_path, root_dir)) + if (!path_strv_resolve_uniq(p->sysvrcnd_path, root_dir)) return -ENOMEM; if (!strv_isempty(p->sysvinit_path)) { |