summaryrefslogtreecommitdiffstats
path: root/shlibs/mount/src/cache.c
diff options
context:
space:
mode:
authorKarel Zak2010-12-06 11:47:20 +0100
committerKarel Zak2011-01-03 12:28:47 +0100
commit60dafc19adb7b23403db53c511b5a8d080a81d00 (patch)
treeeefcd20bec891692ee85fdfe31bf22322a24cce9 /shlibs/mount/src/cache.c
parentlibmount: remove utab from API, update tests (diff)
downloadkernel-qcow2-util-linux-60dafc19adb7b23403db53c511b5a8d080a81d00.tar.gz
kernel-qcow2-util-linux-60dafc19adb7b23403db53c511b5a8d080a81d00.tar.xz
kernel-qcow2-util-linux-60dafc19adb7b23403db53c511b5a8d080a81d00.zip
libmount: minor fixes in cache.c
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs/mount/src/cache.c')
-rw-r--r--shlibs/mount/src/cache.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/shlibs/mount/src/cache.c b/shlibs/mount/src/cache.c
index c8fd8e77e..eceb2c0ae 100644
--- a/shlibs/mount/src/cache.c
+++ b/shlibs/mount/src/cache.c
@@ -249,7 +249,8 @@ static int mnt_cache_get_probe(mnt_cache *cache, const char *devname,
assert(devname);
assert(res);
- if (cache && cache->pr && strcmp(devname, cache->filename)) {
+ if (cache && cache->pr && (!cache->filename ||
+ strcmp(devname, cache->filename))) {
blkid_free_probe(cache->pr);
free(cache->filename);
cache->filename = NULL;
@@ -405,7 +406,7 @@ char *mnt_cache_find_tag_value(mnt_cache *cache,
* @ambi: returns TRUE if probing result is ambivalent (optional argument)
* @cache: cache for results or NULL
*
- * Returns: fileststem type or NULL in case of error. The result has to be
+ * Returns: filesystem type or NULL in case of error. The result has to be
* deallocated by free() if @cache is NULL.
*/
char *mnt_get_fstype(const char *devname, int *ambi, mnt_cache *cache)