X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapache.c;h=650d67889724d208c5d12cac80910119e7b0bfad;hb=448627953cde2f7b3b138f53f4f2c62f0d48b726;hp=2e91a1bee3b6f4311b178e6472350496853f3ec1;hpb=b81104a423234c04f0eb4ace0ec5e93a363c917a;p=collectd.git

diff --git a/src/apache.c b/src/apache.c
index 2e91a1be..650d6788 100644
--- a/src/apache.c
+++ b/src/apache.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
@@ -63,8 +64,10 @@ typedef struct apache_s apache_t;
 /* TODO: Remove this prototype */
 static int apache_read_host (user_data_t *user_data);
 
-static void apache_free (apache_t *st)
+static void apache_free (void *arg)
 {
+	apache_t *st = arg;
+
 	if (st == NULL)
 		return;
 
@@ -172,7 +175,6 @@ static size_t apache_header_callback (void *buf, size_t size, size_t nmemb,
 static int config_add (oconfig_item_t *ci)
 {
 	apache_t *st;
-	int i;
 	int status;
 
 	st = calloc (1, sizeof (*st));
@@ -192,7 +194,7 @@ static int config_add (oconfig_item_t *ci)
 	}
 	assert (st->name != NULL);
 
-	for (i = 0; i < ci->children_num; i++)
+	for (int i = 0; i < ci->children_num; i++)
 	{
 		oconfig_item_t *child = ci->children + i;
 
@@ -238,14 +240,13 @@ static int config_add (oconfig_item_t *ci)
 
 	if (status == 0)
 	{
-		user_data_t ud;
-		char callback_name[3*DATA_MAX_NAME_LEN];
+		user_data_t ud = {
+			.data = st,
+			.free_func = apache_free
+		};
 
-		memset (&ud, 0, sizeof (ud));
-		ud.data = st;
-		ud.free_func = (void *) apache_free;
+		char callback_name[3*DATA_MAX_NAME_LEN];
 
-		memset (callback_name, 0, sizeof (callback_name));
 		ssnprintf (callback_name, sizeof (callback_name),
 				"apache/%s/%s",
 				(st->host != NULL) ? st->host : hostname_g,
@@ -270,9 +271,8 @@ static int config_add (oconfig_item_t *ci)
 static int config (oconfig_item_t *ci)
 {
 	int status = 0;
-	int i;
 
-	for (i = 0; i < ci->children_num; i++)
+	for (int i = 0; i < ci->children_num; i++)
 	{
 		oconfig_item_t *child = ci->children + i;
 
@@ -463,8 +463,7 @@ static void submit_scoreboard (char *buf, apache_t *st)
 	long long response_start = 0LL;
 	long long response_end   = 0LL;
 
-	int i;
-	for (i = 0; buf[i] != '\0'; i++)
+	for (int i = 0; buf[i] != '\0'; i++)
 	{
 		if (buf[i] == '.') open++;
 		else if (buf[i] == '_') waiting++;