X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Futils_format_graphite.c;h=0af586ffa2a29816d75829364e695bb6d61e6408;hb=d7ad0d6a5533eacd589a1293f19905d8eeabbf39;hp=904f43c5ac0c6ad7d507783860bbc93285d5cede;hpb=3458b7647a8a5b7555b3fb0097d81bda4923e7c6;p=collectd.git diff --git a/src/utils_format_graphite.c b/src/utils_format_graphite.c index 904f43c5..0af586ff 100644 --- a/src/utils_format_graphite.c +++ b/src/utils_format_graphite.c @@ -150,33 +150,29 @@ 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 - { ssnprintf (tmp_type, sizeof (tmp_type), "%s%c%s", 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);