X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_riemann.c;h=6db3ef58ac88349adfd274cb1d1015e7cf9f4089;hb=bcf9c488e832b4cba43b1c1e35d58f463feb967f;hp=488b482171bb5150fa60a299feee4019e45d7d3e;hpb=be126043c2be20399d7670fe194645292018bde0;p=collectd.git diff --git a/src/write_riemann.c b/src/write_riemann.c index 488b4821..6db3ef58 100644 --- a/src/write_riemann.c +++ b/src/write_riemann.c @@ -293,18 +293,17 @@ wrr_value_to_event(struct riemann_host const *host, /* {{{ */ vl->type_instance); if (host->always_append_ds || (ds->ds_num > 1)) { if (host->event_service_prefix == NULL) - snprintf(service_buffer, sizeof(service_buffer), "%s/%s", - &name_buffer[1], ds->ds[index].name); + snprintf(service_buffer, sizeof(service_buffer), "%s/%s", &name_buffer[1], + ds->ds[index].name); else snprintf(service_buffer, sizeof(service_buffer), "%s%s/%s", - host->event_service_prefix, &name_buffer[1], - ds->ds[index].name); + host->event_service_prefix, &name_buffer[1], ds->ds[index].name); } else { if (host->event_service_prefix == NULL) sstrncpy(service_buffer, &name_buffer[1], sizeof(service_buffer)); else snprintf(service_buffer, sizeof(service_buffer), "%s%s", - host->event_service_prefix, &name_buffer[1]); + host->event_service_prefix, &name_buffer[1]); } riemann_event_set( @@ -353,7 +352,7 @@ wrr_value_to_event(struct riemann_host const *host, /* {{{ */ char ds_type[DATA_MAX_NAME_LEN]; snprintf(ds_type, sizeof(ds_type), "%s:rate", - DS_TYPE_TO_STRING(ds->ds[index].type)); + DS_TYPE_TO_STRING(ds->ds[index].type)); riemann_event_string_attribute_add(event, "ds_type", ds_type); } else { riemann_event_string_attribute_add(event, "ds_type", @@ -803,7 +802,7 @@ static int wrr_config_node(oconfig_item_t *ci) /* {{{ */ } snprintf(callback_name, sizeof(callback_name), "write_riemann/%s", - host->name); + host->name); user_data_t ud = {.data = host, .free_func = wrr_free};