tree-wide: rename path_join_many() to path_join()

$ git grep -e path_join_many -l|xargs sed -r -i 's/path_join_many/path_join/g'

The two test functions are merged into one.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2018-11-30 10:59:47 +01:00
parent 30016f21b3
commit 62a85ee0a9
23 changed files with 72 additions and 95 deletions
+5 -5
View File
@@ -110,7 +110,7 @@ int path_make_absolute_cwd(const char *p, char **ret) {
if (r < 0)
return r;
c = path_join_many(cwd, p);
c = path_join(cwd, p);
}
if (!c)
return -ENOMEM;
@@ -481,7 +481,7 @@ bool path_equal_or_files_same(const char *a, const char *b, int flags) {
return path_equal(a, b) || files_same(a, b, flags) > 0;
}
char* path_join_many_internal(const char *first, ...) {
char* path_join_internal(const char *first, ...) {
char *joined, *q;
const char *p;
va_list ap;
@@ -499,9 +499,9 @@ char* path_join_many_internal(const char *first, ...) {
*
* Examples:
*
* path_join_many("foo", "bar") → "foo/bar"
* path_join_many("foo/", "bar") → "foo/bar"
* path_join_many("", "foo", "", "bar", "") → "foo/bar" */
* path_join("foo", "bar") → "foo/bar"
* path_join("foo/", "bar") → "foo/bar"
* path_join("", "foo", "", "bar", "") → "foo/bar" */
sz = strlen(first);
va_start(ap, first);