diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-05-17 15:46:20 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-05-17 15:46:20 +0100 |
| commit | 957e21258d23679a0b4b9f46a720750ff86d8cf8 (patch) | |
| tree | b88a710e28eb954ab54ab4ccf7491ca1f01a3ef9 /src/plugins/regexp.c | |
| parent | 29a3b94f4dc310b1f8b77ec982b9062f80192424 (diff) | |
| download | rspamd-957e21258d23679a0b4b9f46a720750ff86d8cf8.tar.gz rspamd-957e21258d23679a0b4b9f46a720750ff86d8cf8.zip | |
[Rework] Rework expression API
Diffstat (limited to 'src/plugins/regexp.c')
| -rw-r--r-- | src/plugins/regexp.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/plugins/regexp.c b/src/plugins/regexp.c index 2fea0be97..6841e452a 100644 --- a/src/plugins/regexp.c +++ b/src/plugins/regexp.c @@ -442,7 +442,7 @@ regexp_module_reconfig (struct rspamd_config *cfg) static gboolean rspamd_lua_call_expression_func (struct ucl_lua_funcdata *lua_data, struct rspamd_task *task, - GArray *args, gint *res, + GArray *args, gdouble *res, const gchar *symbol) { lua_State *L = lua_data->L; @@ -511,7 +511,7 @@ process_regexp_item (struct rspamd_task *task, void *user_data) { struct regexp_module_item *item = user_data; - gint res = FALSE; + gdouble res = FALSE; /* Non-threaded version */ if (item->lua_function) { @@ -526,12 +526,7 @@ process_regexp_item (struct rspamd_task *task, else { /* Process expression */ if (item->expr) { - struct rspamd_expr_process_data process_data; - memset (&process_data, 0, sizeof process_data); - - process_data.task = task; - - res = rspamd_process_expression (item->expr, &process_data); + res = rspamd_process_expression (item->expr, 0, task); } else { msg_warn_task ("FIXME: %s symbol is broken with new expressions", @@ -539,7 +534,7 @@ process_regexp_item (struct rspamd_task *task, } } - if (res) { + if (res != 0) { rspamd_task_insert_result (task, item->symbol, res, NULL); } |