aboutsummaryrefslogtreecommitdiffstats
path: root/src/libserver
diff options
context:
space:
mode:
Diffstat (limited to 'src/libserver')
-rw-r--r--src/libserver/cfg_rcl.c6
-rw-r--r--src/libserver/fuzzy_backend.c6
-rw-r--r--src/libserver/html.c7
-rw-r--r--src/libserver/re_cache.c10
-rw-r--r--src/libserver/rspamd_control.c3
-rw-r--r--src/libserver/spf.c2
6 files changed, 12 insertions, 22 deletions
diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 27ccb57bc..aafbf5427 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -627,7 +627,7 @@ rspamd_rcl_worker_handler (rspamd_mempool_t *pool, const ucl_object_t *obj,
return FALSE;
}
- if (!whandler->parser.flags & RSPAMD_CL_FLAG_MULTIPLE) {
+ if (!(whandler->parser.flags & RSPAMD_CL_FLAG_MULTIPLE)) {
break;
}
}
@@ -1230,7 +1230,7 @@ rspamd_rcl_add_section (struct rspamd_rcl_section **top,
}
else {
parent_doc = (*top)->doc_ref;
- new->doc_ref = new->doc_ref = rspamd_rcl_add_doc_obj (parent_doc,
+ new->doc_ref = rspamd_rcl_add_doc_obj (parent_doc,
NULL,
name,
type,
@@ -2176,7 +2176,7 @@ rspamd_rcl_section_parse_defaults (struct rspamd_rcl_section *section,
return FALSE;
}
- if (!cur->pd.flags & RSPAMD_CL_FLAG_MULTIPLE) {
+ if (!(cur->pd.flags & RSPAMD_CL_FLAG_MULTIPLE)) {
break;
}
}
diff --git a/src/libserver/fuzzy_backend.c b/src/libserver/fuzzy_backend.c
index b52dae95a..3f0bed465 100644
--- a/src/libserver/fuzzy_backend.c
+++ b/src/libserver/fuzzy_backend.c
@@ -280,7 +280,7 @@ rspamd_fuzzy_backend_run_stmt (struct rspamd_fuzzy_backend *backend,
}
stmt = prepared_stmts[idx].stmt;
- g_assert (prepared_stmts[idx].idx == idx);
+ g_assert ((int)prepared_stmts[idx].idx == idx);
if (stmt == NULL) {
if ((retcode = sqlite3_prepare_v2 (backend->db, prepared_stmts[idx].sql, -1,
@@ -472,7 +472,6 @@ rspamd_fuzzy_backend_check (struct rspamd_fuzzy_backend *backend,
gint64 timestamp;
gint64 shingle_values[RSPAMD_SHINGLE_SIZE], i, sel_id, cur_id,
cur_cnt, max_cnt;
- const char *digest;
if (backend == NULL) {
return rep;
@@ -566,9 +565,6 @@ rspamd_fuzzy_backend_check (struct rspamd_fuzzy_backend *backend,
rc = rspamd_fuzzy_backend_run_stmt (backend, FALSE,
RSPAMD_FUZZY_BACKEND_GET_DIGEST_BY_ID, sel_id);
if (rc == SQLITE_OK) {
- digest = sqlite3_column_text (
- prepared_stmts[RSPAMD_FUZZY_BACKEND_GET_DIGEST_BY_ID].stmt,
- 0);
timestamp = sqlite3_column_int64 (
prepared_stmts[RSPAMD_FUZZY_BACKEND_GET_DIGEST_BY_ID].stmt,
2);
diff --git a/src/libserver/html.c b/src/libserver/html.c
index 5c55d6f30..77de30e8c 100644
--- a/src/libserver/html.c
+++ b/src/libserver/html.c
@@ -1661,7 +1661,7 @@ GByteArray*
rspamd_html_process_part_full (rspamd_mempool_t *pool, struct html_content *hc,
GByteArray *in, GList **exceptions, GHashTable *urls, GHashTable *emails)
{
- const guchar *p, *c, *end, *tag_start = NULL, *savep = NULL;
+ const guchar *p, *c, *end, *savep = NULL;
guchar t;
gboolean closing = FALSE, need_decode = FALSE, save_space = FALSE,
balanced, url_text;
@@ -1735,7 +1735,6 @@ rspamd_html_process_part_full (rspamd_mempool_t *pool, struct html_content *hc,
switch (t) {
case '<':
p ++;
- tag_start = p;
closing = FALSE;
break;
case '!':
@@ -1750,14 +1749,12 @@ rspamd_html_process_part_full (rspamd_mempool_t *pool, struct html_content *hc,
case '/':
closing = TRUE;
p ++;
- tag_start = p;
break;
case '>':
/* Empty tag */
hc->flags |= RSPAMD_HTML_FLAG_BAD_ELEMENTS;
state = tag_end;
p ++;
- tag_start = NULL;
break;
default:
state = tag_content;
@@ -1786,7 +1783,6 @@ rspamd_html_process_part_full (rspamd_mempool_t *pool, struct html_content *hc,
break;
default:
state = sgml_content;
- tag_start = p;
break;
}
@@ -1959,7 +1955,6 @@ rspamd_html_process_part_full (rspamd_mempool_t *pool, struct html_content *hc,
break;
case tag_end:
- tag_start = NULL;
substate = 0;
savep = NULL;
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);
diff --git a/src/libserver/rspamd_control.c b/src/libserver/rspamd_control.c
index e274f100b..6696cd183 100644
--- a/src/libserver/rspamd_control.c
+++ b/src/libserver/rspamd_control.c
@@ -804,7 +804,6 @@ rspamd_srv_request_handler (gint fd, short what, gpointer ud)
struct rspamd_srv_request_data *rd = ud;
struct msghdr msg;
struct iovec iov;
- struct cmsghdr *cmsg;
guchar fdspace[CMSG_SPACE(sizeof (int))];
gssize r;
gint rfd = -1;
@@ -846,8 +845,6 @@ rspamd_srv_request_handler (gint fd, short what, gpointer ud)
}
if (msg.msg_controllen >= CMSG_SPACE(sizeof (int))) {
- cmsg = CMSG_FIRSTHDR (&msg);
-
rfd = *(int *) CMSG_DATA(CMSG_FIRSTHDR (&msg));
}
diff --git a/src/libserver/spf.c b/src/libserver/spf.c
index e8394ec74..31dba5d89 100644
--- a/src/libserver/spf.c
+++ b/src/libserver/spf.c
@@ -429,7 +429,7 @@ spf_record_process_addr (struct spf_record *rec, struct spf_addr *addr, struct
{
struct spf_addr *naddr;
- if (!addr->flags & RSPAMD_SPF_FLAG_PROCESSED) {
+ if (!(addr->flags & RSPAMD_SPF_FLAG_PROCESSED)) {
/* That's the first address */
if (reply->type == RDNS_REQUEST_AAAA) {
memcpy (addr->addr6,
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-28 11:23:31 +0000