X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapache.c;h=e10a15d46a01e4b9ba6a429d7ecb16861d022a10;hb=3d74a63ae43c1786eb9b966e2209c24c5643dae8;hp=40d0efe2bc3d22e093e0a2652e9fd1bd09963083;hpb=44760d0d783660a0cd03df07b9017f1a6fd66ddd;p=collectd.git

diff --git a/src/apache.c b/src/apache.c
index 40d0efe2..e10a15d4 100644
--- a/src/apache.c
+++ b/src/apache.c
@@ -25,9 +25,9 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <curl/curl.h>
 
@@ -174,7 +174,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));
@@ -194,7 +193,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;
 
@@ -240,14 +239,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 = 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,
@@ -272,9 +270,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;
 
@@ -465,8 +462,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++;