X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fopenldap.c;h=dd3226d3a193d1478d8f3ec8ce06b0226b01e9fb;hb=51bc7c4a5523f2b03c24e32064b28c7c8426534d;hp=d424cb457557fe563ebc4cf997604d42a19ada53;hpb=02f8dbc0985310574ea2837cd5e3c06cccda203d;p=collectd.git diff --git a/src/openldap.c b/src/openldap.c index d424cb45..dd3226d3 100644 --- a/src/openldap.c +++ b/src/openldap.c @@ -192,17 +192,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) /* {{{ */ @@ -663,15 +659,13 @@ static int cldap_config_add (oconfig_item_t *ci) /* {{{ */ (st->host != NULL) ? st->host : hostname_g, (st->name != NULL) ? st->name : "default"); - user_data_t ud = { - .data = st - }; - status = plugin_register_complex_read (/* group = */ NULL, /* name = */ callback_name, /* callback = */ cldap_read_host, /* interval = */ 0, - /* user_data = */ &ud); + &(user_data_t) { + .data = st, + }); } }