lib/canonicalize: rename to ul_absolute_path()

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/include/canonicalize.h b/include/canonicalize.h
index ff6ef0dd6e49ae2faee08271ba49057b63b1a30a..81a30ed123ab28cda55133acfc7b0114809cb8bb 100644 (file)
--- a/include/canonicalize.h
+++ b/include/canonicalize.h
@@ -20,7 +20,7 @@ extern char *canonicalize_path_restricted(const char *path);
 extern char *canonicalize_dm_name(const char *ptname);
 extern char *__canonicalize_dm_name(const char *prefix, const char *ptname);
 
-extern char *absolute_path(const char *path);
+extern char *ul_absolute_path(const char *path);
 
 static inline int is_relative_path(const char *path)
 {

diff --git a/lib/canonicalize.c b/lib/canonicalize.c
index 6e70afe18a102397aeefa7bde920167cce52938e..b36115f1929141a3d189a99a9385174da0c928d4 100644 (file)
--- a/lib/canonicalize.c
+++ b/lib/canonicalize.c
@@ -83,7 +83,7 @@ static int is_dm_devname(char *canonical, char **name)
  * relative path. If the path is no relative than returns NULL. The path does
  * not have to exist.
  */
-char *absolute_path(const char *path)
+char *ul_absolute_path(const char *path)
 {
        char cwd[PATH_MAX], *res, *p;
        size_t psz, csz;

diff --git a/libmount/src/tab.c b/libmount/src/tab.c
index 4209d697a53113ab5bd2a801543965637eca58fd..9535dd751565fe96a2b8b7b674d511a1fbe41404 100644 (file)
--- 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 = absolute_path(path))) {
+       if (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) {