[Rework] Use hash tables for symbols options

2 files changed, 20 insertions, 13 deletions

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index f33422dfe..ace286dbf 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -804,17 +804,21 @@ make_rewritten_subject (struct metric *metric, struct rspamd_task *task)
 }
 
 static ucl_object_t *
-rspamd_str_list_ucl (GList *str_list)
+rspamd_str_hash_ucl (GHashTable *ht)
 {
+	GHashTableIter it;
+	gpointer k, v;
 	ucl_object_t *top = NULL, *obj;
-	GList *cur;
 
 	top = ucl_object_typed_new (UCL_ARRAY);
-	cur = str_list;
-	while (cur) {
-		obj = ucl_object_fromstring (cur->data);
-		ucl_array_append (top, obj);
-		cur = g_list_next (cur);
+
+	if (ht) {
+		g_hash_table_iter_init (&it, ht);
+
+		while (g_hash_table_iter_next (&it, &k, &v)) {
+			obj = ucl_object_fromstring ((const char *)v);
+			ucl_array_append (top, obj);
+		}
 	}
 
 	return top;
@@ -841,8 +845,8 @@ rspamd_metric_symbol_ucl (struct rspamd_task *task, struct metric *m,
 				description), "description", 0, false);
 	}
 	if (sym->options != NULL) {
-		ucl_object_insert_key (obj, rspamd_str_list_ucl (
-				sym->options), "options", 0, false);
+		ucl_object_insert_key (obj, rspamd_str_hash_ucl (sym->options),
+				"options", 0, false);
 	}
 
 	return obj;
diff --git a/src/libserver/task.c b/src/libserver/task.c
index b9fca4d4a..6cf7532fd 100644
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -1043,14 +1043,17 @@ rspamd_task_log_metric_res (struct rspamd_task *task,
 				}
 
 				if (lf->flags & RSPAMD_LOG_FLAG_SYMBOLS_PARAMS) {
-					GList *cur;
+					GHashTableIter it;
+					gpointer k, v;
 
 					rspamd_printf_fstring (&symbuf, "{");
-
 					j = 0;
+					g_hash_table_iter_init (&it, sym->options);
+
+					while (g_hash_table_iter_next (&it, &k, &v)) {
+						const char *opt = v;
 
-					for (cur = sym->options; cur != NULL; cur = g_list_next (cur)) {
-						rspamd_printf_fstring (&symbuf, "%s;", cur->data);
+						rspamd_printf_fstring (&symbuf, "%s;", opt);
 
 						if (j >= max_log_elts) {
 							rspamd_printf_fstring (&symbuf, "...;");