* Fix inserting composite symbol

* Fix output of log line

diff --git a/src/filter.c b/src/filter.c
index 83868e9b9a57a45dc739d81970903ea05ef8c880..f1851d29543119f116cdc466fb283c1f100d0a64 100644 (file)
--- a/src/filter.c
+++ b/src/filter.c
@@ -315,7 +315,6 @@ composites_foreach_callback (gpointer key, gpointer value, void *data)
        GQueue                         *stack;
        GList                          *symbols = NULL, *s;
        gsize                           cur, op1, op2;
-       struct symbol                  *res;
 
        stack = g_queue_new ();
 
@@ -369,10 +368,7 @@ composites_foreach_callback (gpointer key, gpointer value, void *data)
                                s = g_list_next (s);
                        }
                        /* Add new symbol */
-                       res = memory_pool_alloc (cd->task->task_pool, sizeof (struct symbol));
-                       res->score = 1.;
-                       res->options = NULL;
-                       g_hash_table_insert (cd->metric_res->symbols, key, res);
+                       insert_result (cd->task, key, 1.0, NULL);
                }
        }
 

diff --git a/src/logger.c b/src/logger.c
index 4b04a93f17a2965d0a0c1862105f59abbaa6974b..c7626a03c1f64574028b5b966d8dd92550b40f93 100644 (file)
--- a/src/logger.c
+++ b/src/logger.c
@@ -176,7 +176,7 @@ close_log (void)
        case RSPAMD_LOG_FILE:
                if (rspamd_log->enabled) {
                        if (rspamd_log->repeats > REPEATS_MIN) {
-                               snprintf (tmpbuf, sizeof (tmpbuf), "Last message repeated %ud times", rspamd_log->repeats);
+                               rspamd_snprintf (tmpbuf, sizeof (tmpbuf), "Last message repeated %ud times", rspamd_log->repeats);
                                rspamd_log->repeats = 0;
                                if (rspamd_log->saved_message) {
                                        file_log_function (NULL, rspamd_log->saved_function, rspamd_log->cfg->log_level, rspamd_log->saved_message, TRUE, NULL);