[Minor] Fix various style issues

diff --git a/src/libmime/archives.c b/src/libmime/archives.c
index d714335fd5d5e37e47ff99e9bdd7362f58c6be86..2123e1131e6c63abf37c96d0f352f73adab57480 100644 (file)
--- a/src/libmime/archives.c
+++ b/src/libmime/archives.c
@@ -18,7 +18,6 @@
 #include "message.h"
 #include "task.h"
 #include "archives.h"
-#include "fstring.h"
 
 static void
 rspamd_archive_dtor (gpointer p)

diff --git a/src/libmime/email_addr.c b/src/libmime/email_addr.c
index d534be53f609931daa193eca293343375dbc98dd..c857794c8da5fb45a6d6efc4fecec46fca3030ab 100644 (file)
--- a/src/libmime/email_addr.c
+++ b/src/libmime/email_addr.c
@@ -19,7 +19,6 @@
 #include "message.h"
 #include "printf.h"
 #include "smtp_parsers.h"
-#include "mime_headers.h"
 
 static void
 rspamd_email_addr_dtor (struct rspamd_email_address *addr)

diff --git a/src/libmime/filter.c b/src/libmime/filter.c
index c2eeecc32b526836a6df84e0c5c54b727311859f..c95dfc585807fd3eede9a1c1b03f15e5e9b3fa10 100644 (file)
--- a/src/libmime/filter.c
+++ b/src/libmime/filter.c
@@ -19,7 +19,6 @@
 #include "rspamd.h"
 #include "message.h"
 #include "lua/lua_common.h"
-#include "cryptobox.h"
 #include <math.h>
 #include "contrib/uthash/utlist.h"
 

diff --git a/src/libmime/message.c b/src/libmime/message.c
index c429892aadd26e889e4fc9290f5a85d8f25d9f23..d445362b2bc49e1c2120e1513713999bb3e8db10 100644 (file)
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -17,15 +17,10 @@
 #include "util.h"
 #include "rspamd.h"
 #include "message.h"
-#include "cfg_file.h"
-#include "libutil/regexp.h"
 #include "html.h"
 #include "images.h"
 #include "archives.h"
-#include "email_addr.h"
-#include "utlist.h"
 #include "tokenizers/tokenizers.h"
-#include "cryptobox.h"
 #include "smtp_parsers.h"
 #include "mime_parser.h"
 #include "mime_encoding.h"
@@ -34,8 +29,6 @@
 #include "libstemmer.h"
 #endif
 
-#include <iconv.h>
-
 #define GTUBE_SYMBOL "GTUBE"
 
 #define SET_PART_RAW(part) ((part)->flags &= ~RSPAMD_MIME_TEXT_PART_FLAG_UTF)

diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c
index 71b8d4bdc399a318181a11da3111e71bc16d21ab..0c036a89cd2026e7cc6c8f8630f3f955453db4c5 100644 (file)
--- a/src/libmime/mime_expressions.c
+++ b/src/libmime/mime_expressions.c
@@ -20,7 +20,6 @@
 #include "message.h"
 #include "mime_expressions.h"
 #include "html.h"
-#include "email_addr.h"
 #include "lua/lua_common.h"
 #include "utlist.h"
 
@@ -1172,7 +1171,7 @@ rspamd_recipients_distance (struct rspamd_task *task, GArray * args,
                }
        }
 
-       if ((double)(hits * num / 2.) / (double)total >= threshold) {
+       if ((hits * num / 2.) / (double)total >= threshold) {
                return TRUE;
        }
 

diff --git a/src/libmime/mime_headers.c b/src/libmime/mime_headers.c
index 75ec1b96de42b08bb25fca4275e99b8369e7815a..2ea4c0dcbc504291f0e519a4b23ad9745998d432 100644 (file)
--- a/src/libmime/mime_headers.c
+++ b/src/libmime/mime_headers.c
@@ -17,10 +17,6 @@
 #include "mime_headers.h"
 #include "smtp_parsers.h"
 #include "mime_encoding.h"
-#include "email_addr.h"
-#include "task.h"
-#include "cryptobox.h"
-#include "contrib/libottery/ottery.h"
 
 static void
 rspamd_mime_header_check_special (struct rspamd_task *task,

diff --git a/src/libmime/mime_parser.c b/src/libmime/mime_parser.c
index 98eef6d985a8f951351e9bc8c2c996d5db43ca68..f36b4848baf89cfb834e3a02ae5d05cea9d378e5 100644 (file)
--- a/src/libmime/mime_parser.c
+++ b/src/libmime/mime_parser.c
@@ -19,9 +19,7 @@
 #include "mime_parser.h"
 #include "mime_headers.h"
 #include "message.h"
-#include "content_type.h"
 #include "multipattern.h"
-#include "cryptobox.h"
 #include "contrib/libottery/ottery.h"
 
 struct rspamd_mime_parser_lib_ctx {
@@ -1009,7 +1007,7 @@ rspamd_mime_parse_message (struct rspamd_task *task,
 
                if (hdr_pos > 0 && hdr_pos < str.len) {
 
-                       task->raw_headers_content.begin = (gchar *) (str.str);
+                       task->raw_headers_content.begin = str.str;
                        task->raw_headers_content.len = hdr_pos;
                        task->raw_headers_content.body_start = str.str + body_pos;
 
@@ -1029,7 +1027,7 @@ rspamd_mime_parse_message (struct rspamd_task *task,
                        hdr_pos = rspamd_mime_parser_headers_heuristic (&str, &body_pos);
 
                        if (hdr_pos > 0 && hdr_pos <= str.len) {
-                               task->raw_headers_content.begin = (gchar *) (str.str);
+                               task->raw_headers_content.begin = str.str;
                                task->raw_headers_content.len = hdr_pos;
                                task->raw_headers_content.body_start = str.str + body_pos;
 
@@ -1063,7 +1061,7 @@ rspamd_mime_parse_message (struct rspamd_task *task,
                                rspamd_strcase_equal, NULL, rspamd_ptr_array_free_hard);
 
                if (hdr_pos > 0 && hdr_pos < str.len) {
-                       npart->raw_headers_str = (gchar *) (str.str);
+                       npart->raw_headers_str = str.str;
                        npart->raw_headers_len = hdr_pos;
                        npart->raw_data.begin = str.str + body_pos;
 

diff --git a/src/libserver/monitored.c b/src/libserver/monitored.c
index e411f3541c12daba0956dd19ccc0f9e2963955da..a7b3fb37d20e1c2b2469558aba0ebf0fceff626d 100644 (file)
--- a/src/libserver/monitored.c
+++ b/src/libserver/monitored.c
@@ -17,10 +17,8 @@
 #include "rdns.h"
 #include "mem_pool.h"
 #include "cfg_file.h"
-#include "monitored.h"
 #include "cryptobox.h"
 #include "logger.h"
-#include "radix.h"
 
 static const gdouble default_monitoring_interval = 60.0;
 static const guint default_max_errors = 3;

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index d9e4f9b7b5ea9709dff0311d7820c8d061d4ae21..b209cdecd8b6ba250d4407411b4ee1dc96215964 100644 (file)
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -15,18 +15,11 @@
  */
 #include "config.h"
 #include "rspamd.h"
-#include "util.h"
-#include "cfg_file.h"
-#include "cfg_rcl.h"
 #include "message.h"
 #include "utlist.h"
-#include "http.h"
 #include "http_private.h"
-#include "email_addr.h"
 #include "worker_private.h"
-#include "cryptobox.h"
 #include "contrib/zstd/zstd.h"
-#include "contrib/uthash/utlist.h"
 #include "lua/lua_common.h"
 #include "unix-std.h"
 #include <math.h>

diff --git a/src/libserver/redis_pool.c b/src/libserver/redis_pool.c
index 0b7c308444778d70044bcabe9d66a51fb599ab46..1ce5f5e07f22166445a65ba42d131c2e48da35d0 100644 (file)
--- a/src/libserver/redis_pool.c
+++ b/src/libserver/redis_pool.c
@@ -22,7 +22,6 @@
 #include "contrib/hiredis/async.h"
 #include "contrib/hiredis/adapters/libevent.h"
 #include "cryptobox.h"
-#include "ref.h"
 #include "logger.h"
 
 struct rspamd_redis_pool_elt;

diff --git a/src/libserver/roll_history.c b/src/libserver/roll_history.c
index a535a7bf9d519563b9d8f2f652bd6dbcb4546c2d..ea79b590bff6965d6fbe47e309360fe242ebcd84 100644 (file)
--- a/src/libserver/roll_history.c
+++ b/src/libserver/roll_history.c
@@ -15,8 +15,6 @@
  */
 #include "config.h"
 #include "rspamd.h"
-#include "roll_history.h"
-#include "ucl.h"
 #include "lua/lua_common.h"
 #include "unix-std.h"
 

diff --git a/src/libserver/spf.c b/src/libserver/spf.c
index 39c7c232b2202f17aabc2cab54c25a7ad4590ba4..f106e534d08e24a4189f8b31ba234194826c0b67 100644 (file)
--- a/src/libserver/spf.c
+++ b/src/libserver/spf.c
@@ -18,9 +18,7 @@
 #include "spf.h"
 #include "rspamd.h"
 #include "message.h"
-#include "filter.h"
 #include "utlist.h"
-#include "email_addr.h"
 
 #define SPF_VER1_STR "v=spf1"
 #define SPF_VER2_STR "spf2."

diff --git a/src/libserver/url.c b/src/libserver/url.c
index eb470c7dbe2840d29df98ceaa0940c833cacb514..347550ba67eb709e9db843671a06f52ccbebd4cd 100644 (file)
--- a/src/libserver/url.c
+++ b/src/libserver/url.c
@@ -42,12 +42,9 @@
 #include "config.h"
 #include "url.h"
 #include "util.h"
-#include "fstring.h"
 #include "rspamd.h"
 #include "message.h"
-#include "http.h"
 #include "multipattern.h"
-#include "http_parser.h"
 #include "contrib/uthash/utlist.h"
 
 typedef struct url_match_s {

diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c
index f9d777e31073bd6f1a54fc7f5fe59a2261d5fa65..9419b92869b6a60f2f32c0322f02b37d10109560 100644 (file)
--- a/src/libserver/worker_util.c
+++ b/src/libserver/worker_util.c
@@ -15,7 +15,6 @@
  */
 #include "config.h"
 #include "rspamd.h"
-#include "message.h"
 #include "lua/lua_common.h"
 #include "worker_util.h"
 #include "unix-std.h"

diff --git a/src/libstat/classifiers/bayes.c b/src/libstat/classifiers/bayes.c
index fb1ffdde2d3b2fcd1f4c6989092220442606e014..730581ced606f23196c8d84c68eafac6ee13cfcf 100644 (file)
--- a/src/libstat/classifiers/bayes.c
+++ b/src/libstat/classifiers/bayes.c
@@ -18,8 +18,6 @@
  */
 #include "classifiers.h"
 #include "rspamd.h"
-#include "filter.h"
-#include "cfg_file.h"
 #include "stat_internal.h"
 #include "math.h"
 

diff --git a/src/libstat/tokenizers/osb.c b/src/libstat/tokenizers/osb.c
index 6c8ac354b624b4aaffb08f0cffbed8c3059578b4..317cdc66ceb56f8f88bb6c385badc67ad6436d46 100644 (file)
--- a/src/libstat/tokenizers/osb.c
+++ b/src/libstat/tokenizers/osb.c
@@ -19,7 +19,6 @@
 
 #include "tokenizers.h"
 #include "stat_internal.h"
-#include "cryptobox.h"
 
 /* Size for features pipe */
 #define DEFAULT_FEATURE_WINDOW_SIZE 5

diff --git a/src/libutil/addr.c b/src/libutil/addr.c
index c70946c09d1f46cebb94e5095ebbb7bfe2739779..fb4c537c46897e74f7ea10e8230eeb7e2926c7d9 100644 (file)
--- a/src/libutil/addr.c
+++ b/src/libutil/addr.c
@@ -18,7 +18,6 @@
 #include "util.h"
 #include "logger.h"
 #include "cryptobox.h"
-#include "radix.h"
 #include "unix-std.h"
 /* pwd and grp */
 #ifdef HAVE_PWD_H

diff --git a/src/libutil/logger.c b/src/libutil/logger.c
index 920c5231b4697b33b336a2191ca132af9fa5943b..faab981d9162f7c4b3a2ad8a04761bbcd23b6d5d 100644 (file)
--- a/src/libutil/logger.c
+++ b/src/libutil/logger.c
@@ -15,12 +15,9 @@
  */
 #include "config.h"
 #include "logger.h"
-#include "util.h"
 #include "rspamd.h"
 #include "map.h"
-#include "cryptobox.h"
 #include "ottery.h"
-#include "keypair.h"
 #include "unix-std.h"
 
 #ifdef HAVE_SYSLOG_H

diff --git a/src/libutil/map.c b/src/libutil/map.c
index 11ef2c441da0f51770e0b572ef0949767c6ad236..97a982797267aee727b325ebc0eed7dfdc9e681f 100644 (file)
--- a/src/libutil/map.c
+++ b/src/libutil/map.c
@@ -22,10 +22,6 @@
 #include "http.h"
 #include "http_private.h"
 #include "rspamd.h"
-#include "cryptobox.h"
-#include "unix-std.h"
-#include "http_parser.h"
-#include "libutil/regexp.h"
 #include "contrib/zstd/zstd.h"
 
 #ifdef WITH_HYPERSCAN

diff --git a/src/libutil/mem_pool.c b/src/libutil/mem_pool.c
index 1ee0558a19c10afd2c116f2e5f9a8a9b30c87a54..187d3ca66021e7d39d77748412d22c42187cc4a0 100644 (file)
--- a/src/libutil/mem_pool.c
+++ b/src/libutil/mem_pool.c
@@ -17,7 +17,6 @@
 #include "mem_pool.h"
 #include "fstring.h"
 #include "logger.h"
-#include "utlist.h"
 #include "ottery.h"
 #include "unix-std.h"
 

diff --git a/src/libutil/multipattern.c b/src/libutil/multipattern.c
index 5f7e48daa9e285ea82dd195f600c8fe39e2ed90f..13a167cd17a3729626d31d6fb5c1bbdf1cdb7422 100644 (file)
--- a/src/libutil/multipattern.c
+++ b/src/libutil/multipattern.c
@@ -17,13 +17,11 @@
 #include "config.h"
 #include "libutil/multipattern.h"
 #include "libutil/str_util.h"
-#include "libutil/util.h"
-#include "libutil/printf.h"
 #include "libcryptobox/cryptobox.h"
-#include "unix-std.h"
-#include "libutil/logger.h"
 
 #ifdef WITH_HYPERSCAN
+#include "logger.h"
+#include "unix-std.h"
 #include "hs.h"
 #endif
 #include "acism.h"

diff --git a/src/libutil/printf.c b/src/libutil/printf.c
index 6935c03b06df15d6eb3d769bfe6f6a79949abb22..b86011b23f877bd507670045e9d345aedd2be0c7 100644 (file)
--- a/src/libutil/printf.c
+++ b/src/libutil/printf.c
@@ -39,9 +39,7 @@
  */
 
 #include "printf.h"
-#include "fstring.h"
 #include "str_util.h"
-#include <math.h>
 
 /**
  * From FreeBSD libutil code

diff --git a/src/lua/lua_cfg_file.c b/src/lua/lua_cfg_file.c
index acf7e32b11c04ab2f7f00e412341e00001ff8f59..2e46f91fce3336decf2c2704f65a1af09573e1a6 100644 (file)
--- a/src/lua/lua_cfg_file.c
+++ b/src/lua/lua_cfg_file.c
@@ -16,9 +16,8 @@
 #include "lua_common.h"
 #include "expression.h"
 #include "composites.h"
-#include "unix-std.h"
+
 #ifdef HAVE_SYS_UTSNAME_H
-#include <sys/utsname.h>
 #endif
 
 /*

diff --git a/src/lua/lua_classifier.c b/src/lua/lua_classifier.c
index 871433124b5d3e84a96cfe4b385a03234e3a7a30..cab488e841a69c80b939cfbc1994b5ba44490e4f 100644 (file)
--- a/src/lua/lua_classifier.c
+++ b/src/lua/lua_classifier.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "cfg_file.h"
 
 /* Classifier methods */
 LUA_FUNCTION_DEF (classifier, get_statfiles);

diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c
index e6e66b900480ad1b8e9954ad826ac6ba117bdb5f..3179c29fc9d7f9d1611ba1c4fca62b6fcade2420 100644 (file)
--- a/src/lua/lua_config.c
+++ b/src/lua/lua_config.c
@@ -18,7 +18,6 @@
 #include "libutil/expression.h"
 #include "libserver/composites.h"
 #include "lua/lua_map.h"
-#include "monitored.h"
 #include "utlist.h"
 #include <math.h>
 
@@ -682,8 +681,7 @@ lua_check_monitored (lua_State * L, gint pos)
 static gint
 lua_config_get_api_version (lua_State *L)
 {
-       lua_pushinteger (L, RSPAMD_LUA_API_VERSION);
-       return 1;
+       return luaL_error (L, "obsolete function");
 }
 
 static gint

diff --git a/src/lua/lua_cryptobox.c b/src/lua/lua_cryptobox.c
index 5e8cec08cd7b55dc323aabaccb39b95cd101c7cb..0e28e52bb7656c689150532fa4bbe06ff1e1321b 100644 (file)
--- a/src/lua/lua_cryptobox.c
+++ b/src/lua/lua_cryptobox.c
@@ -27,11 +27,7 @@
  */
 
 #include "lua_common.h"
-#include "cryptobox.h"
-#include "keypair.h"
 #include "unix-std.h"
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
 
 struct rspamd_lua_cryptobox_hash {
        rspamd_cryptobox_hash_state_t *h;

diff --git a/src/lua/lua_dns.c b/src/lua/lua_dns.c
index 22acbe4d3cf8150b8a5a38b837cf422d1bcec823..6dab3c285cd1b8520e6c986d99b81c84bfd870ac 100644 (file)
--- a/src/lua/lua_dns.c
+++ b/src/lua/lua_dns.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "dns.h"
 #include "utlist.h"
 
 

diff --git a/src/lua/lua_fann.c b/src/lua/lua_fann.c
index 884a40293bf102d3cb1163ccaac1de660291f476..7315de7adb80e645351bbdfe6366b8170e2eb797 100644 (file)
--- a/src/lua/lua_fann.c
+++ b/src/lua/lua_fann.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "util.h"
+
 #ifdef WITH_FANN
 #include <fann.h>
 #endif

diff --git a/src/lua/lua_http.c b/src/lua/lua_http.c
index 31b0b3be3a1ffdf536d2e0deff45dac08c549594..1cc10f48e98e4fc3e0aa5853ecef7a3817ebffbd 100644 (file)
--- a/src/lua/lua_http.c
+++ b/src/lua/lua_http.c
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "dns.h"
-#include "http.h"
 #include "http_private.h"
-#include "utlist.h"
-#include "libcryptobox/keypair.h"
 #include "unix-std.h"
 
 /***
@@ -181,7 +177,7 @@ lua_http_finish_handler (struct rspamd_http_connection *conn,
        /* Error */
        lua_pushnil (cbd->L);
        /* Reply code */
-       lua_pushinteger (cbd->L, msg->code);
+       lua_pushnumber (cbd->L, msg->code);
        /* Body */
        body = rspamd_http_message_get_body (msg, &body_len);
 

diff --git a/src/lua/lua_map.c b/src/lua/lua_map.c
index c0ce00609ea6aa27b341b349645f3d0a053ced4f..40b2ecedc46abb5501640ccad25927b4627f87cc 100644 (file)
--- a/src/lua/lua_map.c
+++ b/src/lua/lua_map.c
@@ -17,8 +17,6 @@
 #include "lua_common.h"
 #include "libutil/map.h"
 #include "libutil/map_private.h"
-#include "libutil/radix.h"
-#include "lua/lua_map.h"
 
 /***
  * This module is used to manage rspamd maps and map like objects

diff --git a/src/lua/lua_mempool.c b/src/lua/lua_mempool.c
index 8fe8b5cc3814e677f4d42407c8464f30c62d9f4f..569fe0eb6d4b017000b159390064efecd245222d 100644 (file)
--- a/src/lua/lua_mempool.c
+++ b/src/lua/lua_mempool.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "mem_pool.h"
 
 /***
  * @module rspamd_mempool
@@ -236,7 +235,7 @@ lua_mempool_suggest_size (lua_State *L)
        struct memory_pool_s *mempool = rspamd_lua_check_mempool (L, 1);
 
        if (mempool) {
-               lua_pushinteger (L, rspamd_mempool_suggest_size ());
+               lua_pushnumber (L, rspamd_mempool_suggest_size ());
                return 0;
        }
        else {

diff --git a/src/lua/lua_mimepart.c b/src/lua/lua_mimepart.c
index 8a9fb85e11323125399208cdcb7d0e8150b18a38..21640aab5542553908541dd809bb0d1e9f81b7a9 100644 (file)
--- a/src/lua/lua_mimepart.c
+++ b/src/lua/lua_mimepart.c
@@ -675,7 +675,7 @@ lua_mimepart_get_length (lua_State * L)
                return 1;
        }
 
-       lua_pushinteger (L, part->parsed_data.len);
+       lua_pushnumber (L, part->parsed_data.len);
 
        return 1;
 }

diff --git a/src/lua/lua_redis.c b/src/lua/lua_redis.c
index 4a0a1cfd95810161c7a9a2f3d3af92a5d542e9cd..c75ca4cfb09dba2581093466dd7d0bb39987243d 100644 (file)
--- a/src/lua/lua_redis.c
+++ b/src/lua/lua_redis.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "dns.h"
 #include "utlist.h"
 
 #include "contrib/hiredis/hiredis.h"

diff --git a/src/lua/lua_regexp.c b/src/lua/lua_regexp.c
index 1640f8023ec35007380a6ad30e6af882a2026e3b..a35ec96b557628e55ead50e2eb794b599a1c1e09 100644 (file)
--- a/src/lua/lua_regexp.c
+++ b/src/lua/lua_regexp.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "regexp.h"
 
 /***
  * @module rspamd_regexp

diff --git a/src/lua/lua_rsa.c b/src/lua/lua_rsa.c
index 659eaecd27ae3410b6d4488c49732dedf21fead4..91cdf497d11772505d40161ee5143b4462fa4ec7 100644 (file)
--- a/src/lua/lua_rsa.c
+++ b/src/lua/lua_rsa.c
@@ -21,12 +21,10 @@
 
 #include "lua_common.h"
 #include "unix-std.h"
-
-#ifdef HAVE_OPENSSL
 #include <openssl/err.h>
+#include <openssl/pem.h>
 #include <openssl/sha.h>
 #include <openssl/rsa.h>
-#include <openssl/pem.h>
 
 LUA_FUNCTION_DEF (rsa_pubkey,   load);
 LUA_FUNCTION_DEF (rsa_pubkey,   create);
@@ -693,12 +691,3 @@ luaopen_rsa (lua_State * L)
 
        lua_settop (L, 0);
 }
-
-#else
-void
-luaopen_rsa (lua_State * L)
-{
-       msg_info ("this rspamd version is not linked against openssl, therefore no "
-               "RSA support is available");
-}
-#endif

diff --git a/src/lua/lua_sqlite3.c b/src/lua/lua_sqlite3.c
index e15673702a8565c57de55737bf2d3d2511859672..97b112ac4075d76cca79143f0b57b8044a59e1ad 100644 (file)
--- a/src/lua/lua_sqlite3.c
+++ b/src/lua/lua_sqlite3.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "util.h"
 #include "sqlite_utils.h"
 
 /***

diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index f4d7f9dd6595c0fb1de5cbfc5ab86b3c782571a9..711708335e3966a1ae6b736dfa5c6693c62aef9c 100644 (file)
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -15,19 +15,11 @@
  */
 #include "lua_common.h"
 #include "message.h"
-#include "protocol.h"
-#include "filter.h"
-#include "dns.h"
-#include "util.h"
 #include "images.h"
 #include "archives.h"
-#include "cfg_file.h"
-#include "email_addr.h"
 #include "utlist.h"
-#include "cryptobox.h"
 #include "unix-std.h"
 #include "libmime/smtp_parsers.h"
-#include "contrib/uthash/utlist.h"
 #include <math.h>
 
 /***
@@ -2582,7 +2574,7 @@ lua_task_get_helo (lua_State *L)
 
        if (task) {
                if (task->helo != NULL) {
-                       lua_pushstring (L, (gchar *)task->helo);
+                       lua_pushstring (L, task->helo);
                        return 1;
                }
                else {
@@ -3998,7 +3990,7 @@ lua_image_get_size (lua_State *L)
        struct rspamd_image *img = lua_check_image (L);
 
        if (img != NULL) {
-               lua_pushinteger (L, img->data->len);
+               lua_pushnumber (L, img->data->len);
        }
        else {
                return luaL_error (L, "invalid arguments");
@@ -4124,7 +4116,7 @@ lua_archive_get_size (lua_State *L)
        struct rspamd_archive *arch = lua_check_archive (L);
 
        if (arch != NULL) {
-               lua_pushinteger (L, arch->size);
+               lua_pushnumber (L, arch->size);
        }
        else {
                return luaL_error (L, "invalid arguments");

diff --git a/src/lua/lua_tcp.c b/src/lua/lua_tcp.c
index 21a357400b8bca61f689ffcdf9869f98a1de40b4..ed8330e81aa8b61d30e5f7e86570a957170fff67 100644 (file)
--- a/src/lua/lua_tcp.c
+++ b/src/lua/lua_tcp.c
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "dns.h"
 #include "utlist.h"
-#include "ref.h"
 #include "unix-std.h"
 
 /***
@@ -875,7 +873,7 @@ lua_tcp_arg_toiovec (lua_State *L, gint pos, struct lua_tcp_cbdata *cbd,
                vec->iov_base = g_malloc (len);
                dtor = g_slice_alloc0 (sizeof (*dtor));
                dtor->dtor = g_free;
-               dtor->data = (void *)vec->iov_base;
+               dtor->data = vec->iov_base;
                LL_PREPEND (cbd->dtors, dtor);
                memcpy (vec->iov_base, str, len);
                vec->iov_len = len;

diff --git a/src/lua/lua_upstream.c b/src/lua/lua_upstream.c
index fe4697758b0d187983e672ff51cc2a6d3639f99a..84d112ef153e80bf44ecf69e4747f8618453a646 100644 (file)
--- a/src/lua/lua_upstream.c
+++ b/src/lua/lua_upstream.c
@@ -15,8 +15,6 @@
  */
 #include "config.h"
 #include "lua_common.h"
-#include "upstream.h"
-#include "cfg_file.h"
 
 
 /***

diff --git a/src/lua/lua_url.c b/src/lua/lua_url.c
index abbbef512130f97cb7fe4cb2d4c6b3225a9b1213..9b69267a449bc438ad37ce91436c158f52d2d76f 100644 (file)
--- a/src/lua/lua_url.c
+++ b/src/lua/lua_url.c
@@ -112,7 +112,7 @@ lua_url_get_length (lua_State *L)
        struct rspamd_lua_url *url = lua_check_url (L, 1);
 
        if (url != NULL) {
-               lua_pushinteger (L, url->url->urllen);
+               lua_pushnumber (L, url->url->urllen);
        }
        else {
                lua_pushnil (L);
@@ -697,7 +697,7 @@ lua_url_table_inserter (struct rspamd_url *url, gsize start_offset,
        lua_url = lua_newuserdata (L, sizeof (struct rspamd_lua_url));
        rspamd_lua_setclass (L, "rspamd{url}", -1);
        lua_url->url = url;
-       lua_pushinteger (L, n + 1);
+       lua_pushnumber (L, n + 1);
        lua_pushlstring (L, url->string, url->urllen);
        lua_settable (L, -3);
 }

diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
index 3ca34b4ccce2e90e13373cb59c6edf0e4d3a7f0a..af24558e4a62660df61cbb87614f3627379b5eaf 100644 (file)
--- a/src/lua/lua_util.c
+++ b/src/lua/lua_util.c
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "task.h"
-#include "rspamd.h"
 #include "html.h"
-#include "cfg_rcl.h"
 #include "tokenizers/tokenizers.h"
-#include "libserver/url.h"
 #include "unix-std.h"
 #include "contrib/zstd/zstd.h"
 #include "libmime/email_addr.h"

diff --git a/src/lua/lua_xmlrpc.c b/src/lua/lua_xmlrpc.c
index 8ae7370e96819207d459aa6f0421090aac64adc6..27d94471268edf891d7f434d6dafda2d5b9db76f 100644 (file)
--- a/src/lua/lua_xmlrpc.c
+++ b/src/lua/lua_xmlrpc.c
@@ -391,7 +391,7 @@ xmlrpc_text (GMarkupParseContext *context,
                case 12:
                        /* Push integer value */
                        num = strtoul (text, NULL, 10);
-                       lua_pushinteger (ud->L, num);
+                       lua_pushnumber (ud->L, num);
                        break;
                case 13:
                        /* Push integer value */

diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index 69c308234efec54b5cbd4f1271269b16175f8c28..317bb7dd42f92fc2095d91d5b019e797c243b285 100644 (file)
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -37,9 +37,7 @@
 #include "libserver/worker_util.h"
 #include "fuzzy_wire.h"
 #include "utlist.h"
-#include "cryptobox.h"
 #include "ottery.h"
-#include "keypair.h"
 #include "lua/lua_common.h"
 #include "unix-std.h"
 #include "libutil/http_private.h"

diff --git a/src/plugins/spf.c b/src/plugins/spf.c
index aa63c8018460a00cf62e668d2461fd406422d54d..883fabde4a1dc6b5d121f7d238cfc865d2d864e0 100644 (file)
--- a/src/plugins/spf.c
+++ b/src/plugins/spf.c
@@ -32,7 +32,6 @@
 #include "libutil/hash.h"
 #include "libutil/map.h"
 #include "rspamd.h"
-#include "addr.h"
 
 #define DEFAULT_SYMBOL_FAIL "R_SPF_FAIL"
 #define DEFAULT_SYMBOL_SOFTFAIL "R_SPF_SOFTFAIL"

diff --git a/src/rspamadm/keypair.c b/src/rspamadm/keypair.c
index c339a7d88e5b82be6722b3b852bd696e3d768765..4f54d0b556c70d1370bbfbda952e54e3b31683a0 100644 (file)
--- a/src/rspamadm/keypair.c
+++ b/src/rspamadm/keypair.c
@@ -18,9 +18,6 @@
 #include "cryptobox.h"
 #include "printf.h"
 #include "http.h"
-#include "ucl.h"
-#include "libcryptobox/keypair.h"
-#include "libutil/str_util.h"
 
 static gboolean hex_encode = FALSE;
 static gboolean raw = FALSE;

diff --git a/src/rspamadm/lua_repl.c b/src/rspamadm/lua_repl.c
index 2f6ee5676a89d89341dea0ac277b844f78d14384..58c803e3e0cc146270e2b0c72a815b2d1a20d242 100644 (file)
--- a/src/rspamadm/lua_repl.c
+++ b/src/rspamadm/lua_repl.c
@@ -16,13 +16,11 @@
 
 #include "config.h"
 #include "rspamadm.h"
-#include "cryptobox.h"
 #include "libutil/http.h"
 #include "libutil/http_private.h"
 #include "printf.h"
 #include "lua/lua_common.h"
 #include "message.h"
-#include "task.h"
 #include "unix-std.h"
 #include "linenoise.h"
 #include "worker_util.h"