From: Josef 'Jeff' Sipek <jeff.sipek@open-xchange.com>
Date: Fri, 21 Aug 2020 18:23:50 +0000 (-0400)
Subject: stats: event exporter - Use category exporting helper to avoid duplicates (json)
X-Git-Tag: 2.3.13~179
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de4d3eb974a2096c7a5c42a6fb019c33a75f930c;p=thirdparty%2Fdovecot%2Fcore.git

stats: event exporter - Use category exporting helper to avoid duplicates (json)
---

diff --git a/src/stats/event-exporter-fmt-json.c b/src/stats/event-exporter-fmt-json.c
index 3ccf09f3e9..ce98911a81 100644
--- a/src/stats/event-exporter-fmt-json.c
+++ b/src/stats/event-exporter-fmt-json.c
@@ -96,23 +96,11 @@ static void json_export_timestamps(string_t *dest, struct event *event,
 	str_append_c(dest, ',');
 }
 
-static void append_category(string_t *dest, struct event_category *cat)
-{
-	/* append parent's categories */
-	if (cat->parent != NULL)
-		append_category(dest, cat->parent);
-
-	/* append this */
-	append_str(dest, cat->name);
-	str_append_c(dest, ',');
-}
-
 static void json_export_categories(string_t *dest, struct event *event,
 				   const struct metric_export_info *info)
 {
 	struct event_category *const *cats;
 	unsigned int count;
-	unsigned int i;
 
 	if ((info->include & EVENT_EXPORTER_INCL_CATEGORIES) == 0)
 		return;
@@ -121,12 +109,8 @@ static void json_export_categories(string_t *dest, struct event *event,
 	str_append(dest, ":[");
 
 	cats = event_get_categories(event, &count);
-	for (i = 0; i < count; i++)
-		append_category(dest, cats[i]);
-
-	/* remove trailing comma */
-	if (count != 0)
-		str_truncate(dest, str_len(dest) - 1);
+	event_export_helper_fmt_categories(dest, cats, count,
+					   append_str, ",");
 
 	str_append(dest, "],");
 }