X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=32b72e286a0b0d08a4f8202ad17ac8296601504a;hb=361f0013d5a20fa0b229376ddc3804c6e00058c5;hp=2ad91ca3f0c90c9e67e882cf8f30b4877de65abc;hpb=680c818999f50daa1ad3b80317b101bf0205c441;p=collectd.git

diff --git a/src/mysql.c b/src/mysql.c
index 2ad91ca3..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>
@@ -47,8 +46,8 @@ struct mysql_database_s /* {{{ */
 	char *user;
 	char *pass;
 	char *database;
-	
-	// mysql_ssl_set params
+
+	/* mysql_ssl_set params */
 	char *key;
 	char *cert;
 	char *ca;
@@ -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);
@@ -276,7 +276,7 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */
 static MYSQL *getconnection (mysql_database_t *db)
 {
 	const char *cipher;
-	
+
 	if (db->is_connected)
 	{
 		int status;
@@ -318,7 +318,7 @@ static MYSQL *getconnection (mysql_database_t *db)
 	}
 
 	cipher = mysql_get_ssl_cipher (db->con);
-	
+
 	INFO ("mysql plugin: Successfully connected to database %s "
 			"at server %s with cipher %s "
 			"(server version: %s, protocol version: %d) ",
@@ -1001,7 +1001,7 @@ static int mysql_read (user_data_t *ud)
 				counter_submit ("mysql_sort", "scan", val, db);
 
 		}
-		else if (strncmp (key, "Slow_queries", strlen ("Slow_queries")) == 0) 
+		else if (strncmp (key, "Slow_queries", strlen ("Slow_queries")) == 0)
 		{
 			counter_submit ("mysql_slow_queries", NULL , val, db);
 		}