X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_format_graphite.c;h=69c619f425702ffc6c329738673c6887bdac875a;hb=c76419c0cf983f1ecd3d36aa236cc4e3f9cff733;hp=c7262655d1bc3cd2071b956813de6b7c14d7ce9e;hpb=836598b100f9acec988fcfe9a14e349e4186783b;p=collectd.git

diff --git a/src/utils_format_graphite.c b/src/utils_format_graphite.c
index c7262655..69c619f4 100644
--- a/src/utils_format_graphite.c
+++ b/src/utils_format_graphite.c
@@ -150,6 +150,7 @@ static int gr_format_name (char *ret, int ret_len,
         sstrncpy (tmp_plugin, n_plugin, sizeof (tmp_plugin));
 
     if (n_type_instance[0] != '\0')
+    {
         if ((flags & GRAPHITE_DROP_DUPE_FIELDS) && strcmp(n_plugin, n_type) == 0)
             sstrncpy (tmp_type, n_type_instance, sizeof (tmp_type));
         else
@@ -157,18 +158,21 @@ static int gr_format_name (char *ret, int ret_len,
                 n_type,
                 (flags & GRAPHITE_SEPARATE_INSTANCES) ? '.' : '-',
                 n_type_instance);
+    }
     else
         sstrncpy (tmp_type, n_type, sizeof (tmp_type));
 
     /* Assert always_append_ds -> ds_name */
     assert (!(flags & GRAPHITE_ALWAYS_APPEND_DS) || (ds_name != NULL));
     if (ds_name != NULL)
+    {
         if ((flags & GRAPHITE_DROP_DUPE_FIELDS) && strcmp(tmp_plugin, tmp_type) == 0)
             ssnprintf (ret, ret_len, "%s%s%s.%s.%s",
                 prefix, n_host, postfix, tmp_plugin, ds_name);
         else
             ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s",
                 prefix, n_host, postfix, tmp_plugin, tmp_type, ds_name);
+    }
     else
         ssnprintf (ret, ret_len, "%s%s%s.%s.%s",
             prefix, n_host, postfix, tmp_plugin, tmp_type);
@@ -253,6 +257,7 @@ int format_graphite (char *buffer, size_t buffer_size,
         }
         memcpy((void *) (buffer + buffer_pos), message, message_len);
         buffer_pos += message_len;
+        buffer[buffer_pos] = '\0';
     }
     sfree (rates);
     return (status);