summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2015-10-15 13:57:39 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2015-10-15 13:57:39 +0100
commit844bdb5d1d2f121bc450d3f3d687bdec9d41f772 (patch)
treeb1d4b03828e3efaaa9f40962ac90ba6ce99bb86e
parent2307e77a56a235a08ba7f5fcdcb5883676855a08 (diff)
downloadrspamd-844bdb5d1d2f121bc450d3f3d687bdec9d41f772.tar.gz
rspamd-844bdb5d1d2f121bc450d3f3d687bdec9d41f772.zip
Words are now rspamd_ftok_t
-rw-r--r--src/libmime/message.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libmime/message.c b/src/libmime/message.c
index 8b257aab3..e17d159f3 100644
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -1015,7 +1015,7 @@ rspamd_words_levenshtein_distance (struct rspamd_task *task,
{
guint s1len, s2len, x, y, lastdiag, olddiag;
guint *column;
- rspamd_fstring_t *s1, *s2;
+ rspamd_ftok_t *s1, *s2;
gint eq;
static const guint max_words = 8192;
@@ -1039,9 +1039,9 @@ rspamd_words_levenshtein_distance (struct rspamd_task *task,
for (y = 1, lastdiag = x - 1; y <= s1len; y++) {
olddiag = column[y];
- s1 = &g_array_index (w1, rspamd_fstring_t, y - 1);
- s2 = &g_array_index (w2, rspamd_fstring_t, x - 1);
- eq = rspamd_fstring_equal (s1, s2) ? 0 : 1;
+ s1 = &g_array_index (w1, rspamd_ftok_t, y - 1);
+ s2 = &g_array_index (w2, rspamd_ftok_t, x - 1);
+ eq = rspamd_ftok_cmp (s1, s2) == 0 ? 0 : 1;
column[y] = MIN3 (column[y] + 1, column[y - 1] + 1,
lastdiag + (eq));
lastdiag = olddiag;
@@ -1724,7 +1724,7 @@ rspamd_message_parse (struct rspamd_task *task)
dw = rspamd_words_levenshtein_distance (task,
p1->normalized_words,
p2->normalized_words);
- diff = tw > 0 ? (100.0 * (gdouble)(tw - dw) / (gdouble)tw) : 100;
+ diff = (100.0 * (gdouble)(tw - dw) / (gdouble)tw);
debug_task (
"different words: %d, total words: %d, "