From 27e45bef83fe17b339fe345e3455a67b7416e1d3 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Fri, 15 Jan 2016 15:54:43 +0000 Subject: Fix warnings. --- src/libserver/re_cache.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/libserver/re_cache.c') diff --git a/src/libserver/re_cache.c b/src/libserver/re_cache.c index 94bed145d..4434576c8 100644 --- a/src/libserver/re_cache.c +++ b/src/libserver/re_cache.c @@ -539,14 +539,11 @@ rspamd_re_cache_process_regexp_data (struct rspamd_re_runtime *rt, const guchar *in, gsize len, gboolean is_raw) { - struct rspamd_re_cache_elt *elt; - struct rspamd_re_class *re_class; + guint64 re_id; guint ret = 0; re_id = rspamd_regexp_get_cache_id (re); - elt = g_ptr_array_index (rt->cache->re, re_id); - re_class = rspamd_regexp_get_class (re); if (len == 0 || in == NULL) { /* We assume this as absence of the specified data */ @@ -560,8 +557,13 @@ rspamd_re_cache_process_regexp_data (struct rspamd_re_runtime *rt, setbit (rt->checked, re_id); rt->results[re_id] = ret; #else + struct rspamd_re_cache_elt *elt; + struct rspamd_re_class *re_class; struct rspamd_re_hyperscan_cbdata cbdata; + elt = g_ptr_array_index (rt->cache->re, re_id); + re_class = rspamd_regexp_get_class (re); + if (rt->cache->disable_hyperscan || elt->match_type == RSPAMD_RE_CACHE_PCRE) { ret = rspamd_re_cache_process_pcre (rt, re, in, len, is_raw); setbit (rt->checked, re_id); -- cgit v1.2.3