Fix warnings.

diff --git a/src/libserver/spf.c b/src/libserver/spf.c
index 7ba7145834a2efa47c4d99edf398b4e2ba8f82c2..f324454aec2c8f520f253296b71d2feeb8e6adc6 100644 (file)
--- a/src/libserver/spf.c
+++ b/src/libserver/spf.c
@@ -230,7 +230,7 @@ rspamd_spf_process_reference (struct spf_resolved *target,
                struct spf_addr *addr, struct spf_record *rec, gboolean top)
 {
        struct spf_resolved_element *elt;
-       struct spf_addr *cur, taddr;
+       struct spf_addr *cur = NULL, taddr;
        guint i;
 
        if (addr) {
@@ -252,6 +252,7 @@ rspamd_spf_process_reference (struct spf_resolved *target,
                        }
                }
 
+               g_assert (cur != NULL);
                if (!(cur->flags & RSPAMD_SPF_FLAG_PARSED)) {
                        /* Unresolved redirect */
                        msg_info ("redirect to %s cannot be resolved", cur->spf_string);
@@ -630,6 +631,7 @@ parse_spf_domain_mask (struct spf_record *rec, struct spf_addr *addr,
 
        resolved = g_ptr_array_index (rec->resolved, rec->resolved->len - 1);
        host = resolved->cur_domain;
+       c = p;
 
        while (*p) {
                t = *p;

diff --git a/src/libstat/backends/mmaped_file.c b/src/libstat/backends/mmaped_file.c
index aab678ff5019f7c50b6cb1487d34643a5cfba98d..b5d8ea6423ea1ccf30f5ed3c4a137f395dade069 100644 (file)
--- a/src/libstat/backends/mmaped_file.c
+++ b/src/libstat/backends/mmaped_file.c
@@ -913,16 +913,15 @@ rspamd_mmaped_file_runtime (struct rspamd_task *task,
 
                filename = ucl_object_tostring (filenameo);
 
-               if (learn) {
-
+               sizeo = ucl_object_find_key (stcf->opts, "size");
+               if (sizeo == NULL || ucl_object_type (sizeo) != UCL_INT) {
+                       msg_err ("statfile %s has no size defined", stcf->symbol);
+                       return NULL;
+               }
 
-                       sizeo = ucl_object_find_key (stcf->opts, "size");
-                       if (sizeo == NULL || ucl_object_type (sizeo) != UCL_INT) {
-                               msg_err ("statfile %s has no size defined", stcf->symbol);
-                               return NULL;
-                       }
+               size = ucl_object_toint (sizeo);
 
-                       size = ucl_object_toint (sizeo);
+               if (learn) {
                        rspamd_mmaped_file_create (ctx, filename, size, stcf);
                }
 

diff --git a/src/libutil/expression.c b/src/libutil/expression.c
index 359bc2af7ac702d7c477d0e48309b84d68bea623..9acef5e86c95a5512a8f3202d52908ac1f272d1a 100644 (file)
--- a/src/libutil/expression.c
+++ b/src/libutil/expression.c
@@ -837,7 +837,7 @@ static gint
 rspamd_ast_process_node (struct rspamd_expression *expr, gint flags, GNode *node,
                gpointer data)
 {
-       struct rspamd_expression_elt *elt, *celt, *parelt;
+       struct rspamd_expression_elt *elt, *celt, *parelt = NULL;
        GNode *cld;
        gint acc = G_MININT, lim = G_MININT, val;
        gdouble t1, t2;

diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index c4e595c8b58c8b958f4baa3b77313b87a86d27ac..ef05102c541afbf139c8c3991ec221b904955cde 100644 (file)
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -1247,7 +1247,7 @@ lua_task_get_queue_id (lua_State *L)
 {
        struct rspamd_task *task = lua_check_task (L, 1);
 
-       if (task && task->queue_id != NULL && task->queue_id != "undef") {
+       if (task && task->queue_id != NULL && strcmp (task->queue_id, "undef") != 0) {
                lua_pushstring (L, task->queue_id);
                return 1;
        }