format_graphite: s/metric_t/metric_single_t/

diff --git a/src/utils/format_graphite/format_graphite.c b/src/utils/format_graphite/format_graphite.c
index 2eedf0ddf87fa01913e6a1b5e3c3b4d60cd8b3eb..e1131f808c40b7e877062b978d0f69b7a4b88561 100644 (file)
--- a/src/utils/format_graphite/format_graphite.c
+++ b/src/utils/format_graphite/format_graphite.c
@@ -35,7 +35,8 @@
 /* Utils functions to format data sets in graphite format.
  * Largely taken from write_graphite.c as it remains the same formatting */
 
-static int gr_format_values(strbuf_t *buf, const metric_t *m, gauge_t rate) {
+static int gr_format_values(strbuf_t *buf, metric_single_t const *m,
+                            gauge_t rate) {
   if (m->value_type == DS_TYPE_GAUGE)
     return strbuf_printf(buf, GAUGE_FORMAT, m->value.gauge);
   else if (rate != -1)
@@ -88,9 +89,9 @@ static int graphite_print_escaped(strbuf_t *buf, char const *s,
   return 0;
 }
 
-static int gr_format_name(strbuf_t *buf, metric_t const *m, char const *prefix,
-                          char const *suffix, char const escape_char,
-                          unsigned int flags) {
+static int gr_format_name(strbuf_t *buf, metric_single_t const *m,
+                          char const *prefix, char const *suffix,
+                          char const escape_char, unsigned int flags) {
   if (prefix != NULL) {
     strbuf_print(buf, prefix);
   }
@@ -112,7 +113,7 @@ static int gr_format_name(strbuf_t *buf, metric_t const *m, char const *prefix,
   return 0;
 }
 
-int format_graphite(strbuf_t *buf, metric_t const *m, char const *prefix,
+int format_graphite(strbuf_t *buf, metric_single_t const *m, char const *prefix,
                     char const *postfix, char const escape_char,
                     unsigned int flags) {
   gauge_t rate = -1;

diff --git a/src/utils/format_graphite/format_graphite.h b/src/utils/format_graphite/format_graphite.h
index 3f85fbc377d590f992d6e990b8ea8c15c0aefdc1..dced705d8b5d088345f766498bd1d74289624727 100644 (file)
--- a/src/utils/format_graphite/format_graphite.h
+++ b/src/utils/format_graphite/format_graphite.h
@@ -35,8 +35,8 @@
 #define GRAPHITE_USE_TAGS 0x20
 #define GRAPHITE_REVERSE_HOST 0x40
 
-int format_graphite(strbuf_t *buf, const metric_t *metric_p, const char *prefix,
-                    const char *postfix, const char escape_char,
+int format_graphite(strbuf_t *buf, metric_single_t const *m, const char *prefix,
+                    const char *suffix, const char escape_char,
                     unsigned int flags);
 
 #endif /* UTILS_FORMAT_GRAPHITE_H */

diff --git a/src/utils/format_graphite/format_graphite_test.c b/src/utils/format_graphite/format_graphite_test.c
index a5f57368738c448b6503486ea316ae2bfc5d9573..c3a92143b735d2b51a3008eaf767ce4dfb2edc6f 100644 (file)
--- a/src/utils/format_graphite/format_graphite_test.c
+++ b/src/utils/format_graphite/format_graphite_test.c
@@ -93,7 +93,7 @@ DEF_TEST(metric_name) {
       CHECK_ZERO(identity_add_label(id, cases[i].keys[j], cases[i].values[j]));
     }
 
-    metric_t m = {
+    metric_single_t m = {
         .identity = id,
         .value = cases[i].value,
         .value_type = cases[i].value_type,