diff options
| author | LaMont Jones <lamont@debian.org> | 2009-05-07 07:18:32 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2009-05-07 07:18:32 -0600 |
| commit | 1ed87670d79580d3e849f1d0c847eb11ec20b316 (patch) | |
| tree | d98fd3e6f3aa389de3d9eaa54fbadc6a2ffe0443 /lib | |
| parent | 786bb331d7077c2c137b2b642ee608f4430b6101 (diff) | |
| parent | b64279dab84373f060d589bdd519dbfa255adc58 (diff) | |
| download | util-linux-old-1ed87670d79580d3e849f1d0c847eb11ec20b316.tar.gz | |
Merge commit 'origin/master'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fsprobe.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/fsprobe.c b/lib/fsprobe.c index 8c9eb6dc..cd008cc3 100644 --- a/lib/fsprobe.c +++ b/lib/fsprobe.c @@ -14,7 +14,7 @@ #include "pathnames.h" #include "fsprobe.h" -#if defined(HAVE_BLKID_EVALUATE_SPEC) || defined(HAVE_LIBVOLUME_ID) +#if defined(HAVE_BLKID_EVALUATE_TAG) || defined(HAVE_LIBVOLUME_ID) /* ask kernel developers why we need such ugly open() method... */ static int open_device(const char *devname) @@ -112,7 +112,7 @@ fsprobe_known_fstype(const char *fstype) return blkid_known_fstype(fstype); } -#ifdef HAVE_BLKID_EVALUATE_SPEC +#ifdef HAVE_BLKID_EVALUATE_TAG /* * libblkid from util-linux-ng * -- recommended @@ -181,19 +181,19 @@ fsprobe_get_fstype_by_devname(const char *devname) char * fsprobe_get_devname_by_uuid(const char *uuid) { - return blkid_evaluate_spec("UUID", uuid, &blcache); + return blkid_evaluate_tag("UUID", uuid, &blcache); } char * fsprobe_get_devname_by_label(const char *label) { - return blkid_evaluate_spec("LABEL", label, &blcache); + return blkid_evaluate_tag("LABEL", label, &blcache); } -#else /* !HAVE_BLKID_EVALUATE_SPEC */ +#else /* !HAVE_BLKID_EVALUATE_TAG */ /* - * Classic libblkid (from e2fsprogs) without blkid_evaluate_spec() + * Classic libblkid (from e2fsprogs) without blkid_evaluate_tag() * -- deprecated */ #define BLKID_EMPTY_CACHE "/dev/null" @@ -261,7 +261,7 @@ fsprobe_get_uuid_by_devname(const char *devname) return blkid_get_tag_value(blcache, "UUID", devname); } -#endif /* !HAVE_BLKID_EVALUATE_SPEC */ +#endif /* !HAVE_BLKID_EVALUATE_TAG */ #else /* !HAVE_LIBBLKID */ /* |