From e44ff919a7b02f1f5f94ab83a18209173e47e835 Mon Sep 17 00:00:00 2001
From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 4 Mar 2016 13:10:56 +0100
Subject: [PATCH] Fix the remainging -Wshadow issues on master

---
 src/daemon/plugin.c     |  7 +++----
 src/daemon/utils_time.c |  2 +-
 src/mqtt.c              | 14 +++++++-------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c
index be73774a..788b4549 100644
--- a/src/daemon/plugin.c
+++ b/src/daemon/plugin.c
@@ -1378,7 +1378,6 @@ int plugin_register_flush (const char *name,
 	if (ctx.flush_interval != 0)
 	{
 		char *flush_name;
-		user_data_t ud;
 		flush_callback_t *cb;
 
 		flush_name = plugin_flush_callback_name (name);
@@ -1403,15 +1402,15 @@ int plugin_register_flush (const char *name,
 		}
 		cb->timeout = ctx.flush_timeout;
 
-		ud.data = cb;
-		ud.free_func = plugin_flush_timeout_callback_free;
+		ud->data = cb;
+		ud->free_func = plugin_flush_timeout_callback_free;
 
 		status = plugin_register_complex_read (
 			/* group     = */ "flush",
 			/* name      = */ flush_name,
 			/* callback  = */ plugin_flush_timeout_callback,
 			/* interval  = */ ctx.flush_interval,
-			/* user data = */ &ud);
+			/* user data = */ ud);
 
 		sfree (flush_name);
 		if (status != 0)
diff --git a/src/daemon/utils_time.c b/src/daemon/utils_time.c
index 47ed6d39..56c250cd 100644
--- a/src/daemon/utils_time.c
+++ b/src/daemon/utils_time.c
@@ -127,7 +127,7 @@ static int format_rfc3339 (char *buffer, size_t buffer_size, cdtime_t t, _Bool p
 
   if (localtime_r (&t_spec.tv_sec, &t_tm) == NULL) {
     char errbuf[1024];
-    int status = errno;
+    status = errno;
     ERROR ("format_rfc3339: localtime_r failed: %s",
         sstrerror (status, errbuf, sizeof (errbuf)));
     return (status);
diff --git a/src/mqtt.c b/src/mqtt.c
index 8bc412c9..4977f684 100644
--- a/src/mqtt.c
+++ b/src/mqtt.c
@@ -700,11 +700,11 @@ static int mqtt_config_subscriber (oconfig_item_t *ci)
             cf_util_get_string (child, &conf->host);
         else if (strcasecmp ("Port", child->key) == 0)
         {
-            int tmp = cf_util_get_port_number (child);
-            if (tmp < 0)
+            status = cf_util_get_port_number (child);
+            if (status < 0)
                 ERROR ("mqtt plugin: Invalid port number.");
             else
-                conf->port = tmp;
+                conf->port = status;
         }
         else if (strcasecmp ("ClientId", child->key) == 0)
             cf_util_get_string (child, &conf->client_id);
@@ -714,12 +714,12 @@ static int mqtt_config_subscriber (oconfig_item_t *ci)
             cf_util_get_string (child, &conf->password);
         else if (strcasecmp ("QoS", child->key) == 0)
         {
-            int tmp = -1;
-            status = cf_util_get_int (child, &tmp);
-            if ((status != 0) || (tmp < 0) || (tmp > 2))
+            int qos = -1;
+            status = cf_util_get_int (child, &qos);
+            if ((status != 0) || (qos < 0) || (qos > 2))
                 ERROR ("mqtt plugin: Not a valid QoS setting.");
             else
-                conf->qos = tmp;
+                conf->qos = qos;
         }
         else if (strcasecmp ("Topic", child->key) == 0)
             cf_util_get_string (child, &conf->topic);
-- 
2.11.0