From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 7 Jun 2018 08:22:24 +0000 (+0200)
Subject: Merge pull request #2808 from elfiesmelfie/fix_virt_shadow_warning
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=06fe1074812c7f0b903c9aa8d0d9e47036b552b5;hp=499897f2a640e04e97865f89400885084e6aee82

Merge pull request #2808 from elfiesmelfie/fix_virt_shadow_warning

src/virt.c: Fix one 'shadow type' warning
---

diff --git a/src/virt.c b/src/virt.c
index 1ce376cb..87ab8fdc 100644
--- a/src/virt.c
+++ b/src/virt.c
@@ -1024,7 +1024,8 @@ static void domain_state_submit_notif(virDomainPtr dom, int state, int reason) {
   char msg[DATA_MAX_NAME_LEN];
   const char *state_str = domain_states[state];
 #ifdef HAVE_DOM_REASON
-  if ((reason < 0) || ((size_t)reason >= STATIC_ARRAY_SIZE(domain_reasons[0]))) {
+  if ((reason < 0) ||
+      ((size_t)reason >= STATIC_ARRAY_SIZE(domain_reasons[0]))) {
     ERROR(PLUGIN_NAME ": Array index out of bounds: reason=%d", reason);
     return;
   }
@@ -1584,7 +1585,7 @@ static int get_block_stats(struct block_device *block_dev) {
 
 #define NM_ADD_STR_ITEMS(_items, _size)                                        \
   do {                                                                         \
-    for (size_t _i = 0; _i < _size; ++_i) {                                       \
+    for (size_t _i = 0; _i < _size; ++_i) {                                    \
       DEBUG(PLUGIN_NAME                                                        \
             " plugin: Adding notification metadata name=%s value=%s",          \
             _items[_i].name, _items[_i].value);                                \
@@ -1824,7 +1825,7 @@ static int get_if_dev_stats(struct interface_device *if_dev) {
   return 0;
 }
 
-static int domain_lifecycle_event_cb(__attribute__((unused)) virConnectPtr conn,
+static int domain_lifecycle_event_cb(__attribute__((unused)) virConnectPtr con_,
                                      virDomainPtr dom, int event, int detail,
                                      __attribute__((unused)) void *opaque) {
   int domain_state = map_domain_event_to_state(event);