diff options
Diffstat (limited to 'libblkid/src')
| -rw-r--r-- | libblkid/src/devname.c | 4 | ||||
| -rw-r--r-- | libblkid/src/evaluate.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c index 0fb25325ef..b9717e23ab 100644 --- a/libblkid/src/devname.c +++ b/libblkid/src/devname.c @@ -66,7 +66,7 @@ blkid_dev blkid_get_dev(blkid_cache cache, const char *devname, int flags) } /* try canonicalize the name */ - if (!dev && (cn = canonicalize_path(devname))) { + if (!dev && (cn = ul_canonicalize_path(devname))) { if (strcmp(cn, devname) != 0) { DBG(DEVNAME, ul_debug("search canonical %s", cn)); list_for_each(p, &cache->bic_devs) { @@ -200,7 +200,7 @@ static void probe_one(blkid_cache cache, const char *ptname, * to standard /dev/mapper/<name>. */ if (!strncmp(ptname, "dm-", 3) && isdigit(ptname[3])) { - devname = canonicalize_dm_name(ptname); + devname = ul_canonicalize_dm_name(ptname); if (!devname) blkid__scan_dir("/dev/mapper", devno, NULL, &devname); if (devname) diff --git a/libblkid/src/evaluate.c b/libblkid/src/evaluate.c index 26e556c089..a4d04bca93 100644 --- a/libblkid/src/evaluate.c +++ b/libblkid/src/evaluate.c @@ -171,7 +171,7 @@ static char *evaluate_by_udev(const char *token, const char *value, int uevent) if (!S_ISBLK(st.st_mode)) return NULL; - path = canonicalize_path(dev); + path = ul_canonicalize_path(dev); if (!path) return NULL; @@ -298,7 +298,7 @@ char *blkid_evaluate_spec(const char *spec, blkid_cache *cache) if (v) res = blkid_evaluate_tag(t, v, cache); else - res = canonicalize_path(spec); + res = ul_canonicalize_path(spec); free(t); free(v); |