X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Faggregation.c;h=c37caeb5bb0a757a92dffec30f2bce05c46d8a53;hb=8f6aa6970bf787e6a11e095322af3338ec781d78;hp=a80219965192f1065eed0d7813fc0210dfd31e3b;hpb=733fc645b6389d1f42aef8f1c1631f1db7d58196;p=collectd.git

diff --git a/src/aggregation.c b/src/aggregation.c
index a8021996..c37caeb5 100644
--- a/src/aggregation.c
+++ b/src/aggregation.c
@@ -26,12 +26,12 @@
 
 #include "collectd.h"
 
-#include "common.h"
-#include "meta_data.h"
 #include "plugin.h"
+#include "utils/common/common.h"
+#include "utils/lookup/vl_lookup.h"
+#include "utils/metadata/meta_data.h"
 #include "utils_cache.h" /* for uc_get_rate() */
 #include "utils_subst.h"
-#include "utils_vl_lookup.h"
 
 #define AGG_MATCHES_ALL(str) (strcmp("/.*/", str) == 0)
 #define AGG_FUNC_PLACEHOLDER "%{aggregation}"
@@ -198,13 +198,13 @@ static int agg_instance_create_name(agg_instance_t *inst, /* {{{ */
       sstrncpy(inst->ident.plugin_instance, AGG_FUNC_PLACEHOLDER,
                sizeof(inst->ident.plugin_instance));
     else if (strcmp("", tmp_plugin) != 0)
-      snprintf(inst->ident.plugin_instance, sizeof(inst->ident.plugin_instance),
+      ssnprintf(inst->ident.plugin_instance, sizeof(inst->ident.plugin_instance),
                "%s-%s", tmp_plugin, AGG_FUNC_PLACEHOLDER);
     else if (strcmp("", tmp_plugin_instance) != 0)
-      snprintf(inst->ident.plugin_instance, sizeof(inst->ident.plugin_instance),
+      ssnprintf(inst->ident.plugin_instance, sizeof(inst->ident.plugin_instance),
                "%s-%s", tmp_plugin_instance, AGG_FUNC_PLACEHOLDER);
     else
-      snprintf(inst->ident.plugin_instance, sizeof(inst->ident.plugin_instance),
+      ssnprintf(inst->ident.plugin_instance, sizeof(inst->ident.plugin_instance),
                "%s-%s-%s", tmp_plugin, tmp_plugin_instance,
                AGG_FUNC_PLACEHOLDER);
   }