diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-03-04 21:59:48 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-03-04 21:59:48 +0000 |
| commit | 58ff3a43b71928263415a8a874943de9de158018 (patch) | |
| tree | 1ff189aea7cf8c72d4d0953e93daa965ebec9c7f /src/libmime | |
| parent | 7b00e0c737ca83763135b4e212c0b59b0610ac3f (diff) | |
| download | rspamd-58ff3a43b71928263415a8a874943de9de158018.tar.gz rspamd-58ff3a43b71928263415a8a874943de9de158018.zip | |
Write skeleton of rspamd fast regexps.
Diffstat (limited to 'src/libmime')
| -rw-r--r-- | src/libmime/expressions.c | 8 | ||||
| -rw-r--r-- | src/libmime/expressions.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/libmime/expressions.c b/src/libmime/expressions.c index 07253a2bc..769b7dc14 100644 --- a/src/libmime/expressions.c +++ b/src/libmime/expressions.c @@ -647,12 +647,12 @@ parse_expression (rspamd_mempool_t * pool, gchar *line) /* * Rspamd regexp utility functions */ -struct rspamd_regexp * +struct rspamd_regexp_element * parse_regexp (rspamd_mempool_t * pool, const gchar *line, gboolean raw_mode) { const gchar *begin, *end, *p, *src, *start; gchar *dbegin, *dend; - struct rspamd_regexp *result, *check; + struct rspamd_regexp_element *result, *check; gint regexp_flags = G_REGEX_OPTIMIZE | G_REGEX_NO_AUTO_CAPTURE; GError *err = NULL; @@ -662,7 +662,7 @@ parse_regexp (rspamd_mempool_t * pool, const gchar *line, gboolean raw_mode) } src = line; - result = rspamd_mempool_alloc0 (pool, sizeof (struct rspamd_regexp)); + result = rspamd_mempool_alloc0 (pool, sizeof (struct rspamd_regexp_element)); /* Skip whitespaces */ while (g_ascii_isspace (*line)) { line++; @@ -815,7 +815,7 @@ parse_regexp (rspamd_mempool_t * pool, const gchar *line, gboolean raw_mode) /* Avoid multiply regexp structures for similar regexps */ if ((check = - (struct rspamd_regexp *)re_cache_check (result->regexp_text, + (struct rspamd_regexp_element *)re_cache_check (result->regexp_text, pool)) != NULL) { /* Additional check for headers */ if (result->type == REGEXP_HEADER || result->type == diff --git a/src/libmime/expressions.h b/src/libmime/expressions.h index 1ba02d956..469cc690d 100644 --- a/src/libmime/expressions.h +++ b/src/libmime/expressions.h @@ -10,7 +10,7 @@ #include <lua.h> struct rspamd_task; -struct rspamd_regexp; +struct rspamd_regexp_element; /** * Rspamd expression function @@ -60,7 +60,7 @@ typedef gboolean (*rspamd_internal_func_t)(struct rspamd_task *, GList *args, * @param line incoming line * @return regexp structure or NULL in case of error */ -struct rspamd_regexp * parse_regexp (rspamd_mempool_t *pool, +struct rspamd_regexp_element * parse_regexp (rspamd_mempool_t *pool, const gchar *line, gboolean raw_mode); @@ -119,7 +119,7 @@ void re_cache_del (const gchar *line, rspamd_mempool_t *pool); * @param result numeric result of this regexp */ void task_cache_add (struct rspamd_task *task, - struct rspamd_regexp *re, + struct rspamd_regexp_element *re, gint32 result); /** @@ -128,7 +128,7 @@ void task_cache_add (struct rspamd_task *task, * @param pointer regexp data * @return numeric result if value exists or -1 if not */ -gint32 task_cache_check (struct rspamd_task *task, struct rspamd_regexp *re); +gint32 task_cache_check (struct rspamd_task *task, struct rspamd_regexp_element *re); /** * Parse and return a single function argument for a function (may recurse) |