libmount: improve debugging, fix optstr prepend

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

diff --git a/shlibs/mount/src/cache.c b/shlibs/mount/src/cache.c
index a341efd4f2d5bf856c6ec8f7508ff6c3d12f5264..d7a679b5b642bfadd5635818039c9a659aeddaaf 100644 (file)
--- a/shlibs/mount/src/cache.c
+++ b/shlibs/mount/src/cache.c
@@ -267,8 +267,6 @@ int mnt_cache_read_tags(mnt_cache *cache, const char *devname)
                        return 0;
        }
 
-       DBG(CACHE, mnt_debug_h(cache, "reading tags for: %s", devname));
-
        pr = blkid_new_probe_from_filename(devname);
        if (!pr)
                return -1;
@@ -281,6 +279,8 @@ int mnt_cache_read_tags(mnt_cache *cache, const char *devname)
        if (blkid_do_safeprobe(pr))
                goto error;
 
+       DBG(CACHE, mnt_debug_h(cache, "reading tags for: %s", devname));
+
        for (i = 0; i < ARRAY_SIZE(tags); i++) {
                const char *data;
                char *dev;

diff --git a/shlibs/mount/src/optstr.c b/shlibs/mount/src/optstr.c
index 6d4d350526068abeb0f190b9b484145770dfc7a1..b809386aaccc51233e8839234799f0742467f743 100644 (file)
--- a/shlibs/mount/src/optstr.c
+++ b/shlibs/mount/src/optstr.c
@@ -227,7 +227,7 @@ int mnt_optstr_prepend_option(char **optstr, const char *name, const char *value
        *optstr = NULL;
 
        rc = mnt_optstr_append_option(optstr, name, value);
-       if (!rc)
+       if (!rc && tmp)
                rc = mnt_optstr_append_option(optstr, tmp, NULL);
        if (!rc) {
                free(tmp);
@@ -236,6 +236,8 @@ int mnt_optstr_prepend_option(char **optstr, const char *name, const char *value
 
        free(*optstr);
        *optstr = tmp;
+
+       DBG(OPTS, mnt_debug("failed to prepend '%s[=%s]' to '%s'", name, value, optstr));
        return rc;
 }