From 1a90684b8d0cff43a42a22e03c9df79554a858d4 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Fri, 17 Jul 2020 13:10:13 +0200 Subject: [PATCH] format_graphite: s/metric_t/metric_single_t/ --- src/utils/format_graphite/format_graphite.c | 11 ++++++----- src/utils/format_graphite/format_graphite.h | 4 ++-- src/utils/format_graphite/format_graphite_test.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/utils/format_graphite/format_graphite.c b/src/utils/format_graphite/format_graphite.c index 2eedf0ddf..e1131f808 100644 --- 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 3f85fbc37..dced705d8 100644 --- 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 a5f573687..c3a92143b 100644 --- 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, -- 2.47.2