cleanup: warns from older gcc

diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c
index 9d89b80fa95e14738f6de10332299afa7ca7eac4..6ce778de71bfe1fcf5d46d7924d1ec28ecaac841 100644 (file)
--- a/lib/cache/lvmcache.c
+++ b/lib/cache/lvmcache.c
@@ -2137,7 +2137,6 @@ struct lvmcache_info *lvmcache_add(struct labeller *labeller,
        char pvid_s[ID_LEN + 1] __attribute__((aligned(8)));
        char uuid[64] __attribute__((aligned(8)));
        struct lvmcache_vgsummary vgsummary = { 0 };
-       const struct format_type *fmt = labeller->fmt;
        struct lvmcache_info *info;
        struct lvmcache_info *info_lookup;
        struct device_list *devl;
@@ -2178,7 +2177,7 @@ struct lvmcache_info *lvmcache_add(struct labeller *labeller,
 
                        if (!_found_duplicate_pvs && lvmetad_used()) {
                                log_warn("WARNING: Disabling lvmetad cache which does not support duplicate PVs."); 
-                               lvmetad_set_disabled(fmt->cmd, LVMETAD_DISABLE_REASON_DUPLICATES);
+                               lvmetad_set_disabled(labeller->fmt->cmd, LVMETAD_DISABLE_REASON_DUPLICATES);
                        }
                        _found_duplicate_pvs = 1;
 

diff --git a/lib/display/display.c b/lib/display/display.c
index 19421e774eba4387710be69a1645408c5184d504..f8dd338080840d26fd89701867250a5efe429734 100644 (file)
--- a/lib/display/display.c
+++ b/lib/display/display.c
@@ -843,7 +843,7 @@ char yes_no_prompt(const char *prompt, ...)
        static const char _no[] = "no";
        const char *answer = NULL;
        int c = silent_mode() ? EOF : 0;
-       int i, ret = 0, sig = 0;
+       int i = 0, ret = 0, sig = 0;
        char buf[12];
        va_list ap;