diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2016-06-27 11:13:43 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2016-07-01 00:44:48 +0200 |
| commit | 37a33d7414b85e4ce69a2ab6727522faba8a86eb (patch) | |
| tree | 079ec5676fb05f4c08200d9993082bf754dcf75a /lib | |
| parent | 3fd458488649c27f18f1ddb993ba9360f259d47b (diff) | |
| download | lvm2-37a33d7414b85e4ce69a2ab6727522faba8a86eb.tar.gz | |
cleanup: warns from older gcc
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cache/lvmcache.c | 3 | ||||
| -rw-r--r-- | lib/display/display.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 9d89b80fa..6ce778de7 100644 --- 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 19421e774..f8dd33808 100644 --- 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; |