X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fopenldap.c;h=d424cb457557fe563ebc4cf997604d42a19ada53;hb=5523a080010dcb7a61dc0dccc3969a2a048e52f9;hp=35eae32e2ee891bd81cc0ce9a4737804777a64ec;hpb=4103105fb43cd72294f165b2541540b3a8a99532;p=collectd.git

diff --git a/src/openldap.c b/src/openldap.c
index 35eae32e..d424cb45 100644
--- a/src/openldap.c
+++ b/src/openldap.c
@@ -30,7 +30,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #if defined(__APPLE__)
 #pragma clang diagnostic push
@@ -209,7 +208,7 @@ static void cldap_submit_gauge (const char *type, const char *type_instance, /*
 static int cldap_read_host (user_data_t *ud) /* {{{ */
 {
 	cldap_t *st;
-	LDAPMessage *e, *result;
+	LDAPMessage *result;
 	char *dn;
 	int rc;
 	int status;
@@ -250,7 +249,7 @@ static int cldap_read_host (user_data_t *ud) /* {{{ */
 		return (-1);
 	}
 
-	for (e = ldap_first_entry (st->ld, result); e != NULL;
+	for (LDAPMessage *e = ldap_first_entry (st->ld, result); e != NULL;
 		e = ldap_next_entry (st->ld, e))
 	{
 		if ((dn = ldap_get_dn (st->ld, e)) != NULL)
@@ -559,7 +558,6 @@ static int cldap_read_host (user_data_t *ud) /* {{{ */
 static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
 {
 	cldap_t *st;
-	int i;
 	int status;
 
 	st = calloc (1, sizeof (*st));
@@ -581,7 +579,7 @@ static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
 	st->verifyhost = 1;
 	st->version = LDAP_VERSION3;
 
-	for (i = 0; i < ci->children_num; i++)
+	for (int i = 0; i < ci->children_num; i++)
 	{
 		oconfig_item_t *child = ci->children + i;
 
@@ -654,19 +652,20 @@ static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
 		}
 		else
 		{
-			user_data_t ud = { 0 };
 			char callback_name[3*DATA_MAX_NAME_LEN] = { 0 };
 
 			databases = temp;
 			databases[databases_num] = st;
 			databases_num++;
 
-			ud.data = st;
-
 			ssnprintf (callback_name, sizeof (callback_name),
 					"openldap/%s/%s",
 					(st->host != NULL) ? st->host : hostname_g,
-					(st->name != NULL) ? st->name : "default"),
+					(st->name != NULL) ? st->name : "default");
+
+			user_data_t ud = {
+				.data = st
+			};
 
 			status = plugin_register_complex_read (/* group = */ NULL,
 					/* name      = */ callback_name,
@@ -687,10 +686,9 @@ static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
 
 static int cldap_config (oconfig_item_t *ci) /* {{{ */
 {
-	int i;
 	int status = 0;
 
-	for (i = 0; i < ci->children_num; i++)
+	for (int i = 0; i < ci->children_num; i++)
 	{
 		oconfig_item_t *child = ci->children + i;
 
@@ -720,9 +718,7 @@ static int cldap_init (void) /* {{{ */
 
 static int cldap_shutdown (void) /* {{{ */
 {
-	size_t i;
-
-	for (i = 0; i < databases_num; i++)
+	for (size_t i = 0; i < databases_num; i++)
 		if (databases[i]->ld != NULL)
 			ldap_unbind_ext_s (databases[i]->ld, NULL, NULL);
 	sfree (databases);