From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 2 Jun 2016 20:00:43 +0000 (+0200)
Subject: [Minor] Simplify rspamc conversion routines
X-Git-Tag: 1.3.0~410
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4ea9e0293d8490d3a2775a4391518f61537d56ab;p=rspamd.git

[Minor] Simplify rspamc conversion routines
---

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index fa4f20e09..a48de05dc 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -874,8 +874,7 @@ rspamd_metric_result_ucl (struct rspamd_task *task,
 }
 
 void
-rspamd_ucl_torspamc_output (struct rspamd_task *task,
-	ucl_object_t *top,
+rspamd_ucl_torspamc_output (const ucl_object_t *top,
 	rspamd_fstring_t **out)
 {
 	const ucl_object_t *metric, *score,
@@ -927,12 +926,15 @@ rspamd_ucl_torspamc_output (struct rspamd_task *task,
 		}
 	}
 
-	rspamd_printf_fstring (out, "Message-ID: %s\r\n", task->message_id);
+	elt = ucl_object_lookup (top, "message-id");
+	if (elt != NULL) {
+		rspamd_printf_fstring (out, "Message-ID: %s\r\n",
+				ucl_object_tostring (elt));
+	}
 }
 
 static void
-rspamd_ucl_tospamc_output (struct rspamd_task *task,
-	ucl_object_t *top,
+rspamd_ucl_tospamc_output (const ucl_object_t *top,
 	rspamd_fstring_t **out)
 {
 	const ucl_object_t *metric, *score,
@@ -1055,10 +1057,10 @@ rspamd_protocol_http_reply (struct rspamd_http_message *msg,
 	}
 	else {
 		if (RSPAMD_TASK_IS_SPAMC (task)) {
-			rspamd_ucl_tospamc_output (task, top, &msg->body);
+			rspamd_ucl_tospamc_output (top, &msg->body);
 		}
 		else {
-			rspamd_ucl_torspamc_output (task, top, &msg->body);
+			rspamd_ucl_torspamc_output (top, &msg->body);
 		}
 	}
 
diff --git a/src/libserver/protocol.h b/src/libserver/protocol.h
index 186ed939a..1f7acbab2 100644
--- a/src/libserver/protocol.h
+++ b/src/libserver/protocol.h
@@ -88,8 +88,7 @@ void rspamd_protocol_write_reply (struct rspamd_task *task);
  * @param top
  * @param out
  */
-void rspamd_ucl_torspamc_output (struct rspamd_task *task,
-	ucl_object_t *top,
+void rspamd_ucl_torspamc_output (const ucl_object_t *top,
 	rspamd_fstring_t **out);
 
 #endif