X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fopenldap.c;h=e100aeed61bec89dd2e67a523827d64a230bfb75;hb=c76419c0cf983f1ecd3d36aa236cc4e3f9cff733;hp=282e2dc7d1f128d6097695c8230945c52ebbeab5;hpb=958f7776a2daaa1a8664aded0a2c1d717c2f5909;p=collectd.git

diff --git a/src/openldap.c b/src/openldap.c
index 282e2dc7..e100aeed 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
@@ -170,11 +169,7 @@ static void cldap_submit_value (const char *type, const char *type_instance, /*
 	vl.values     = &value;
 	vl.values_len = 1;
 
-	if ((st->host == NULL)
-			|| (strcmp ("", st->host) == 0)
-			|| (strcmp ("localhost", st->host) == 0))
-		sstrncpy (vl.host, hostname_g, sizeof (vl.host));
-	else
+	if ((st->host != NULL) && (strcmp ("localhost", st->host) != 0))
 		sstrncpy (vl.host, st->host, sizeof (vl.host));
 
 	sstrncpy (vl.plugin, "openldap", sizeof (vl.plugin));
@@ -193,17 +188,13 @@ static void cldap_submit_value (const char *type, const char *type_instance, /*
 static void cldap_submit_derive (const char *type, const char *type_instance, /* {{{ */
 		derive_t d, cldap_t *st)
 {
-	value_t v;
-	v.derive = d;
-	cldap_submit_value (type, type_instance, v, st);
+	cldap_submit_value (type, type_instance, (value_t) { .derive = d }, st);
 } /* }}} void cldap_submit_derive */
 
 static void cldap_submit_gauge (const char *type, const char *type_instance, /* {{{ */
 		gauge_t g, cldap_t *st)
 {
-	value_t v;
-	v.gauge = g;
-	cldap_submit_value (type, type_instance, v, st);
+	cldap_submit_value (type, type_instance, (value_t) { .gauge = g }, st);
 } /* }}} void cldap_submit_gauge */
 
 static int cldap_read_host (user_data_t *ud) /* {{{ */
@@ -576,7 +567,7 @@ static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
 	}
 
 	st->starttls = 0;
-	st->timeout = (long) (CDTIME_T_TO_MS(plugin_get_interval()) / 1000);
+	st->timeout = (long) CDTIME_T_TO_TIME_T(plugin_get_interval());
 	st->verifyhost = 1;
 	st->version = LDAP_VERSION3;
 
@@ -653,25 +644,24 @@ 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");
 
 			status = plugin_register_complex_read (/* group = */ NULL,
 					/* name      = */ callback_name,
 					/* callback  = */ cldap_read_host,
 					/* interval  = */ 0,
-					/* user_data = */ &ud);
+					&(user_data_t) {
+						.data = st,
+					});
 		}
 	}