[Minor] Fix some compiler warnings

diff --git a/contrib/libottery/aes_cryptobox.c b/contrib/libottery/aes_cryptobox.c
index 0e5434442abe1daae92d7a86417cafb7d25ffbd7..ea86dc7479112b9ba9a31aabfd0f3f42540cb059 100644 (file)
--- a/contrib/libottery/aes_cryptobox.c
+++ b/contrib/libottery/aes_cryptobox.c
@@ -28,8 +28,10 @@
 #include "cryptobox.h"
 
 #if defined(__x86_64__) && defined(RSPAMD_HAS_TARGET_ATTR)
+#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC push_options
 #pragma GCC target("aes")
+#endif
 #ifndef __SSE2__
 #define __SSE2__
 #endif

diff --git a/src/libcryptobox/base64/avx2.c b/src/libcryptobox/base64/avx2.c
index 432149a29b25c06554382661627a1020a8b82957..c44f8edf1a69c216710421c9900089edb33e7b6c 100644 (file)
--- a/src/libcryptobox/base64/avx2.c
+++ b/src/libcryptobox/base64/avx2.c
@@ -49,8 +49,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 extern const uint8_t base64_table_dec[256];
 
 #ifdef RSPAMD_HAS_TARGET_ATTR
+#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC push_options
 #pragma GCC target("avx2")
+#endif
 #ifndef __SSE2__
 #define __SSE2__
 #endif
@@ -281,5 +283,7 @@ repeat:
        return ret;
 }
 
+#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC pop_options
 #endif
+#endif

diff --git a/src/libcryptobox/base64/sse42.c b/src/libcryptobox/base64/sse42.c
index 806dd5298191ca1a7af1e163c3ad16c31550c338..f3b812dc9b0d4b17e0e20e7812ceb2904dda73cf 100644 (file)
--- a/src/libcryptobox/base64/sse42.c
+++ b/src/libcryptobox/base64/sse42.c
@@ -49,8 +49,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 extern const uint8_t base64_table_dec[256];
 
 #ifdef RSPAMD_HAS_TARGET_ATTR
+#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC push_options
 #pragma GCC target("sse4.2")
+#endif
 #ifndef __SSE2__
 #define __SSE2__
 #endif
@@ -263,5 +265,7 @@ repeat:
        return ret;
 }
 
+#if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC pop_options
 #endif
+#endif

diff --git a/test/rspamd_dkim_test.c b/test/rspamd_dkim_test.c
index f9018bf68074c169581766591840c4cc8ea1a4a6..fde27e4ae0ff9bd0bf9f4d703941f157fc9d6fe1 100644 (file)
--- a/test/rspamd_dkim_test.c
+++ b/test/rspamd_dkim_test.c
@@ -50,7 +50,7 @@ session_fin (gpointer unused)
 }
 #endif
 void
-rspamd_dkim_test_func ()
+rspamd_dkim_test_func (void)
 {
 #if 0
        rspamd_dkim_context_t *ctx;

diff --git a/test/rspamd_dns_test.c b/test/rspamd_dns_test.c
index 25c28528efc27db439b1fe25f7b44b56fc8c7a4f..336e58bfb7187275b8de523217325a7159693807 100644 (file)
--- a/test/rspamd_dns_test.c
+++ b/test/rspamd_dns_test.c
@@ -61,7 +61,7 @@ test_dns_cb (struct rdns_reply *reply, gpointer arg)
 }
 
 void
-rspamd_dns_test_func ()
+rspamd_dns_test_func (void)
 {
 
        struct rspamd_config *cfg;

diff --git a/test/rspamd_lua_test.c b/test/rspamd_lua_test.c
index b014604b54973dcf31a1c1796632a4ad795c1cfb..cc1e96474306114805066e99f8f206b59f4bba31 100644 (file)
--- a/test/rspamd_lua_test.c
+++ b/test/rspamd_lua_test.c
@@ -56,7 +56,7 @@ traceback (lua_State *L)
        return 1;
 }
 
-void
+_Noreturn void
 rspamd_lua_test_func (void)
 {
        lua_State *L = (lua_State *)rspamd_main->cfg->lua_state;

diff --git a/test/rspamd_mem_pool_test.c b/test/rspamd_mem_pool_test.c
index b7e0f0811aa5fd37793468af355fd8a3e97d63b8..156b913dcee6f3af84bb1738bc3a1ec5a85a40ac 100644 (file)
--- a/test/rspamd_mem_pool_test.c
+++ b/test/rspamd_mem_pool_test.c
@@ -12,7 +12,7 @@
 #define TEST2_BUF "test buffertest buffer"
 
 void
-rspamd_mem_pool_test_func ()
+rspamd_mem_pool_test_func (void)
 {
        rspamd_mempool_t *pool;
        rspamd_mempool_stat_t st;

diff --git a/test/rspamd_rrd_test.c b/test/rspamd_rrd_test.c
index 06686422262a7541215785866dc3e0b86d91591f..0fc16edeaa58e5a004922fd67e4fecbb5c9cc2b3 100644 (file)
--- a/test/rspamd_rrd_test.c
+++ b/test/rspamd_rrd_test.c
@@ -24,7 +24,7 @@ const int rows_cnt = 20;
 const int pdp_per_cdp = 60;
 
 void
-rspamd_rrd_test_func ()
+rspamd_rrd_test_func (void)
 {
        gchar  tmpfile[PATH_MAX];
        struct rrd_rra_def rra[4];

diff --git a/test/rspamd_statfile_test.c b/test/rspamd_statfile_test.c
index 2ee32ea48b12941a9026cebfb2aa085ffe765d7e..155e4ad6896f88c2d93c7dfe6c88879cb37b7b57 100644 (file)
--- a/test/rspamd_statfile_test.c
+++ b/test/rspamd_statfile_test.c
@@ -7,7 +7,7 @@
 #define HASHES_NUM 256
 
 void 
-rspamd_statfile_test_func ()
+rspamd_statfile_test_func (void)
 {
        /*
         * XXX: broken, old, need to be rewritten

diff --git a/test/rspamd_url_test.c b/test/rspamd_url_test.c
index aadc18409f329d509ed205cdcb97a3f242fce78a..092274cb149d602d5b8928cb7d3bb77e5789ea78 100644 (file)
--- a/test/rspamd_url_test.c
+++ b/test/rspamd_url_test.c
@@ -55,7 +55,7 @@ const char *test_html = "<some_tag>This is test file with <a href=\"http://micro
 
 /* Function for using in glib test suite */
 void
-rspamd_url_test_func ()
+rspamd_url_test_func (void)
 {
        /* XXX: maybe write test for this */
 }