X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Ftarget_notification.c;h=6d8059ea723f121a5d69ab43bafb914e9090dfd6;hp=2041510ff97934714bc0ea62b7738d02fdf8fef5;hb=48efd3deb4c9139fd060ff3d289896e9031bcc7c;hpb=5ff74d56067ac64db801df5184eb8b97f4b2b645

diff --git a/src/target_notification.c b/src/target_notification.c
index 2041510f..6d8059ea 100644
--- a/src/target_notification.c
+++ b/src/target_notification.c
@@ -26,8 +26,8 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "filter_chain.h"
+#include "utils/common/common.h"
 #include "utils_cache.h"
 #include "utils_subst.h"
 
@@ -221,7 +221,9 @@ static int tn_invoke(const data_set_t *ds, value_list_t *vl, /* {{{ */
     char template[DATA_MAX_NAME_LEN];
     char value_str[DATA_MAX_NAME_LEN];
 
-    ssnprintf(template, sizeof(template), "%%{ds:%s}", ds->ds[i].name);
+    const char *format = "%%{ds:%.*s}";
+    snprintf(template, sizeof(template), format,
+             DATA_MAX_NAME_LEN - strlen(format), ds->ds[i].name);
 
     if (ds->ds[i].type != DS_TYPE_GAUGE) {
       if ((rates == NULL) && (rates_failed == 0)) {
@@ -233,12 +235,12 @@ static int tn_invoke(const data_set_t *ds, value_list_t *vl, /* {{{ */
 
     /* If this is a gauge value, use the current value. */
     if (ds->ds[i].type == DS_TYPE_GAUGE)
-      ssnprintf(value_str, sizeof(value_str), GAUGE_FORMAT,
-                (double)vl->values[i].gauge);
+      snprintf(value_str, sizeof(value_str), GAUGE_FORMAT,
+               (double)vl->values[i].gauge);
     /* If it's a counter, try to use the current rate. This may fail, if the
      * value has been renamed. */
     else if (rates != NULL)
-      ssnprintf(value_str, sizeof(value_str), GAUGE_FORMAT, (double)rates[i]);
+      snprintf(value_str, sizeof(value_str), GAUGE_FORMAT, (double)rates[i]);
     /* Since we don't know any better, use the string `unknown'. */
     else
       sstrncpy(value_str, "unknown", sizeof(value_str));