X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Faggregation.c;h=e2f8ff1c3d3a849cafa215e1984a533471b723ed;hb=master;hp=d7b8e72b1603a6f10c4c6d90a93f645ac684ced7;hpb=883b41f5af2fc46d2d08e8dd23308d8d263e2c22;p=collectd.git diff --git a/src/aggregation.c b/src/aggregation.c index d7b8e72b..e2f8ff1c 100644 --- a/src/aggregation.c +++ b/src/aggregation.c @@ -198,12 +198,12 @@ static int agg_instance_create_name(agg_instance_t *inst, /* {{{ */ if ((strcmp("", tmp_plugin) == 0) && (strcmp("", tmp_plugin_instance) == 0)) sstrncpy(inst->ident.plugin_instance, AGG_FUNC_PLACEHOLDER, sizeof(inst->ident.plugin_instance)); - // tmp_plugin is non-empty and tmp_plugin_instance is empty. + // tmp_plugin is non-empty, and tmp_plugin_instance is empty. else if (strcmp("", tmp_plugin_instance) == 0) ssnprintf(inst->ident.plugin_instance, sizeof(inst->ident.plugin_instance), "%s-%s", tmp_plugin, AGG_FUNC_PLACEHOLDER); - // tmp_plugin is empty and tmp_plugin_instance is non-empty. + // tmp_plugin is empty, and tmp_plugin_instance is non-empty. else if (strcmp("", tmp_plugin) == 0) ssnprintf(inst->ident.plugin_instance, sizeof(inst->ident.plugin_instance), "%s-%s",