diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-01-23 16:26:38 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-01-23 16:26:38 +0000 |
| commit | 2b1f046085b35e685fad03a88c827eee1f483093 (patch) | |
| tree | 007160b7d6f8b9da36586acac8a0d289f1e92a2d /src/libstat/tokenizers/osb.c | |
| parent | 8ebc43f86166fd121d9634349dfca873cb92278c (diff) | |
| download | rspamd-2b1f046085b35e685fad03a88c827eee1f483093.tar.gz rspamd-2b1f046085b35e685fad03a88c827eee1f483093.zip | |
Rework types for tokenizers functions.
Diffstat (limited to 'src/libstat/tokenizers/osb.c')
| -rw-r--r-- | src/libstat/tokenizers/osb.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/libstat/tokenizers/osb.c b/src/libstat/tokenizers/osb.c index abf547f43..f9307ded4 100644 --- a/src/libstat/tokenizers/osb.c +++ b/src/libstat/tokenizers/osb.c @@ -38,13 +38,11 @@ extern const int primes[]; int -osb_tokenize_text (struct tokenizer *tokenizer, +osb_tokenize_text (struct rspamd_stat_tokenizer *tokenizer, rspamd_mempool_t * pool, GArray * input, - GTree ** tree, - gboolean save_token, - gboolean is_utf, - GList *exceptions) + GTree * tree, + gboolean is_utf) { rspamd_token_t *new = NULL; rspamd_fstring_t *token; @@ -52,17 +50,12 @@ osb_tokenize_text (struct tokenizer *tokenizer, gint i, processed = 0; guint w; + g_assert (tree != NULL); + if (input == NULL) { return FALSE; } - if (*tree == NULL) { - *tree = g_tree_new (token_node_compare_func); - rspamd_mempool_add_destructor (pool, - (rspamd_mempool_destruct_t) g_tree_destroy, - *tree); - } - memset (hashpipe, 0xfe, FEATURE_WINDOW_SIZE * sizeof (hashpipe[0])); for (w = 0; w < input->len; w ++) { @@ -106,8 +99,8 @@ osb_tokenize_text (struct tokenizer *tokenizer, memcpy(new->data, &h1, sizeof(h1)); memcpy(new->data + sizeof(h1), &h2, sizeof(h2)); - if (g_tree_lookup (*tree, new) == NULL) { - g_tree_insert (*tree, new, new); + if (g_tree_lookup (tree, new) == NULL) { + g_tree_insert (tree, new, new); } } } |