libmount: use attribute __format__ for debug routines

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

diff --git a/shlibs/mount/src/mountP.h b/shlibs/mount/src/mountP.h
index 9e8aa9dac0b531373f984ab1272359bd1b6e011e..289249e535be15e4cee910c5df5af2b286927457 100644 (file)
--- a/shlibs/mount/src/mountP.h
+++ b/shlibs/mount/src/mountP.h
@@ -59,7 +59,8 @@
 
 extern int libmount_debug_mask;
 
-static inline void mnt_debug(const char *mesg, ...)
+static inline void __attribute__ ((__format__ (__printf__, 1, 2)))
+mnt_debug(const char *mesg, ...)
 {
        va_list ap;
        va_start(ap, mesg);
@@ -68,7 +69,8 @@ static inline void mnt_debug(const char *mesg, ...)
        fputc('\n', stderr);
 }
 
-static inline void mnt_debug_h(void *handler, const char *mesg, ...)
+static inline void __attribute__ ((__format__ (__printf__, 2, 3)))
+mnt_debug_h(void *handler, const char *mesg, ...)
 {
        va_list ap;
 

diff --git a/shlibs/mount/src/optstr.c b/shlibs/mount/src/optstr.c
index 507a7b53b618d1ac69f34c368a4ccd4c2ee264db..626711c48775d5ba4cc7b16536d063edd4b207c7 100644 (file)
--- a/shlibs/mount/src/optstr.c
+++ b/shlibs/mount/src/optstr.c
@@ -258,7 +258,8 @@ int mnt_optstr_prepend_option(char **optstr, const char *name, const char *value
        free(*optstr);
        *optstr = tmp;
 
-       DBG(OPTIONS, mnt_debug("failed to prepend '%s[=%s]' to '%s'", name, value, optstr));
+       DBG(OPTIONS, mnt_debug("failed to prepend '%s[=%s]' to '%s'",
+                               name, value, *optstr));
        return rc;
 }
 

diff --git a/shlibs/mount/src/tab.c b/shlibs/mount/src/tab.c
index 39f7814e4ceb68eeff3a2cef6be15b0ea9ea839d..b30bc00d0ccaaede3b0ec3fba848b69cab0bb956 100644 (file)
--- a/shlibs/mount/src/tab.c
+++ b/shlibs/mount/src/tab.c
@@ -214,7 +214,7 @@ int mnt_tab_get_root_fs(mnt_tab *tb, mnt_fs **root)
        if (!tb || !root)
                return -EINVAL;
 
-       DBG(TAB, mnt_debug_h(tb, "lookup root fs", tb));
+       DBG(TAB, mnt_debug_h(tb, "lookup root fs"));
 
        mnt_reset_iter(&itr, MNT_ITER_FORWARD);
        while(mnt_tab_next_fs(tb, &itr, &fs) == 0) {
@@ -358,7 +358,7 @@ int mnt_tab_find_next_fs(mnt_tab *tb, mnt_iter *itr,
        if (!tb || !itr || !fs || !match_func)
                return -EINVAL;
 
-       DBG(TAB, mnt_debug_h(tb, "lookup next fs", tb));
+       DBG(TAB, mnt_debug_h(tb, "lookup next fs"));
 
        if (!itr->head)
                MNT_ITER_INIT(itr, &tb->ents);

diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c
index 18f66505d29f2537f8e83c9905ccd232da7fd44f..062b9040ec671bea7bf8c1daf7b590797c71d944 100644 (file)
--- a/shlibs/mount/src/tab_parse.c
+++ b/shlibs/mount/src/tab_parse.c
@@ -399,7 +399,7 @@ static int mnt_tab_parse_next(mnt_tab *tb, FILE *f, mnt_fs *fs,
 */
        return 0;
 err:
-       DBG(TAB, mnt_debug_h(tb, "%s:%d: parse error", tb, filename, *nlines));
+       DBG(TAB, mnt_debug_h(tb, "%s:%d: parse error", filename, *nlines));
 
        rc = 1;         /* recoverable error */