X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmysql.c;h=32b72e286a0b0d08a4f8202ad17ac8296601504a;hb=4d370741101aeb037ae52f3529a4a0869e0dc08a;hp=ff6c0a7af38a614e4703a732deb2b7f0437a4fe8;hpb=f0d468892e1c173b226f739be48291981473b4fb;p=collectd.git

diff --git a/src/mysql.c b/src/mysql.c
index ff6c0a7a..32b72e28 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -31,7 +31,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #ifdef HAVE_MYSQL_H
 #include <mysql.h>
@@ -223,21 +222,22 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */
 	/* If all went well, register this database for reading */
 	if (status == 0)
 	{
-		user_data_t ud = { 0 };
 		char cb_name[DATA_MAX_NAME_LEN];
 
 		DEBUG ("mysql plugin: Registering new read callback: %s",
 				(db->database != NULL) ? db->database : "<default>");
 
-		ud.data = (void *) db;
-		ud.free_func = mysql_database_free;
-
 		if (db->instance != NULL)
 			ssnprintf (cb_name, sizeof (cb_name), "mysql-%s",
 					db->instance);
 		else
 			sstrncpy (cb_name, "mysql", sizeof (cb_name));
 
+		user_data_t ud = {
+			.data = db,
+			.free_func = mysql_database_free
+		};
+
 		plugin_register_complex_read (/* group = */ NULL, cb_name,
 					      mysql_read,
 					      /* interval = */ 0, &ud);