From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 9 Feb 2015 17:24:32 +0000 (+0000)
Subject: Remove old UCL workarounds.
X-Git-Tag: 0.9.0~733
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8dcfc4994b8e370867033337c1a231d4fa3bd111;p=rspamd.git

Remove old UCL workarounds.
---

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index f35dee92d..4ea7c17ed 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -461,9 +461,6 @@ rspamd_rcl_metric_handler (struct rspamd_config *cfg, const ucl_object_t *obj,
 	/* Handle symbols */
 	val = ucl_object_find_key (obj, "symbols");
 	if (val != NULL) {
-		if (val->type == UCL_ARRAY) {
-			val = val->value.ov;
-		}
 		if (val->type != UCL_OBJECT) {
 			g_set_error (err, CFG_RCL_ERROR, EINVAL,
 				"symbols must be an object");
@@ -480,9 +477,6 @@ rspamd_rcl_metric_handler (struct rspamd_config *cfg, const ucl_object_t *obj,
 		/* Legacy variant */
 		val = ucl_object_find_key (obj, "symbol");
 		if (val != NULL) {
-			if (val->type == UCL_ARRAY) {
-				val = val->value.ov;
-			}
 			if (val->type != UCL_OBJECT) {
 				g_set_error (err,
 					CFG_RCL_ERROR,