diff options
| author | Karel Zak <kzak@redhat.com> | 2025-08-27 12:39:03 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2025-09-01 13:49:48 +0200 |
| commit | 6585841587c4664ee0941611b682c28d3f36c7a2 (patch) | |
| tree | addf6e3bb774c7680a62e6aa4fcf2efc8b870bbe /libmount/src | |
| parent | 63d14a2e38dbd5c27d3badae5fd418f201a0c802 (diff) | |
| download | util-linux-6585841587c4664ee0941611b682c28d3f36c7a2.tar.gz | |
lib/canonicalize: use ul_ prefix
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount/src')
| -rw-r--r-- | libmount/src/cache.c | 2 | ||||
| -rw-r--r-- | libmount/src/tab.c | 2 | ||||
| -rw-r--r-- | libmount/src/utils.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libmount/src/cache.c b/libmount/src/cache.c index b7956346f8..2942654491 100644 --- a/libmount/src/cache.c +++ b/libmount/src/cache.c @@ -518,7 +518,7 @@ static char *canonicalize_path_and_cache(const char *path, char *value; DBG(CACHE, ul_debugobj(cache, "canonicalize path %s", path)); - p = canonicalize_path(path); + p = ul_canonicalize_path(path); if (p && cache) { value = p; diff --git a/libmount/src/tab.c b/libmount/src/tab.c index 9535dd7515..9a8033c256 100644 --- a/libmount/src/tab.c +++ b/libmount/src/tab.c @@ -1161,7 +1161,7 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat } /* try absolute path */ - if (is_relative_path(path) && (cn = ul_absolute_path(path))) { + if (ul_is_relative_path(path) && (cn = ul_absolute_path(path))) { DBG(TAB, ul_debugobj(tb, "lookup absolute TARGET: '%s'", cn)); mnt_reset_iter(&itr, direction); while (mnt_table_next_fs(tb, &itr, &fs) == 0) { diff --git a/libmount/src/utils.c b/libmount/src/utils.c index 46050ff51f..7626b6f91e 100644 --- a/libmount/src/utils.c +++ b/libmount/src/utils.c @@ -1416,7 +1416,7 @@ static int test_mountpoint(struct libmnt_test *ts __attribute__((unused)), if (argc != 2) return -1; - char *path = canonicalize_path(argv[1]), + char *path = ul_canonicalize_path(argv[1]), *mnt = path ? mnt_get_mountpoint(path) : NULL; printf("%s: %s\n", argv[1], mnt ? : "unknown"); @@ -1451,7 +1451,7 @@ static int test_chdir(struct libmnt_test *ts __attribute__((unused)), return -1; int rc; - char *path = canonicalize_path(argv[1]), + char *path = ul_canonicalize_path(argv[1]), *last = NULL; if (!path) |
