From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 7 Oct 2015 13:25:53 +0000 (+0100)
Subject: Fix a couple of issues.
X-Git-Tag: 1.0.5~66^2~12
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=feec76c52dbd94a4802fec4e85acc40b8e8f21c5;p=rspamd.git

Fix a couple of issues.
---

diff --git a/src/libutil/fstring.c b/src/libutil/fstring.c
index 32fabcea4..e6ce5a052 100644
--- a/src/libutil/fstring.c
+++ b/src/libutil/fstring.c
@@ -357,4 +357,6 @@ rspamd_ftok_map (const rspamd_fstring_t *s)
 	tok = g_slice_alloc (sizeof (*tok));
 	tok->begin = s->str;
 	tok->len = s->len;
-}
\ No newline at end of file
+
+	return tok;
+}
diff --git a/src/libutil/str_util.h b/src/libutil/str_util.h
index 2f822d97c..75938668b 100644
--- a/src/libutil/str_util.h
+++ b/src/libutil/str_util.h
@@ -27,6 +27,7 @@
 #define SRC_LIBUTIL_STR_UTIL_H_
 
 #include "config.h"
+#include "ucl.h"
 
 /**
  * Compare two memory regions of size `l` using case insensitive matching
diff --git a/src/libutil/util.h b/src/libutil/util.h
index 7efb728b1..8284557d9 100644
--- a/src/libutil/util.h
+++ b/src/libutil/util.h
@@ -5,7 +5,6 @@
 #include "mem_pool.h"
 #include "printf.h"
 #include "fstring.h"
-#include "ucl.h"
 #include "addr.h"
 #include "str_util.h"