[Rework] Further types conversion (no functional changes)

6 files changed, 107 insertions, 107 deletions

diff --git a/src/libstat/backends/backends.h b/src/libstat/backends/backends.h
index 4b16950bb..cf7f276ab 100644
--- a/src/libstat/backends/backends.h
+++ b/src/libstat/backends/backends.h
@@ -44,17 +44,17 @@ struct rspamd_stat_backend {
 	gpointer (*runtime)(struct rspamd_task *task,
 						struct rspamd_statfile_config *stcf,
 						gboolean learn, gpointer ctx,
-						gint id);
+						int id);
 
 	gboolean (*process_tokens)(struct rspamd_task *task, GPtrArray *tokens,
-							   gint id,
+							   int id,
 							   gpointer ctx);
 
 	gboolean (*finalize_process)(struct rspamd_task *task,
 								 gpointer runtime, gpointer ctx);
 
 	gboolean (*learn_tokens)(struct rspamd_task *task, GPtrArray *tokens,
-							 gint id,
+							 int id,
 							 gpointer ctx);
 
 	gulong (*total_learns)(struct rspamd_task *task,
@@ -83,15 +83,15 @@ struct rspamd_stat_backend {
 								  struct rspamd_config *cfg, struct rspamd_statfile *st); \
 	gpointer rspamd_##name##_runtime(struct rspamd_task *task,                            \
 									 struct rspamd_statfile_config *stcf,                 \
-									 gboolean learn, gpointer ctx, gint id);              \
+									 gboolean learn, gpointer ctx, int id);               \
 	gboolean rspamd_##name##_process_tokens(struct rspamd_task *task,                     \
-											GPtrArray *tokens, gint id,                   \
+											GPtrArray *tokens, int id,                    \
 											gpointer runtime);                            \
 	gboolean rspamd_##name##_finalize_process(struct rspamd_task *task,                   \
 											  gpointer runtime,                           \
 											  gpointer ctx);                              \
 	gboolean rspamd_##name##_learn_tokens(struct rspamd_task *task,                       \
-										  GPtrArray *tokens, gint id,                     \
+										  GPtrArray *tokens, int id,                      \
 										  gpointer runtime);                              \
 	gboolean rspamd_##name##_finalize_learn(struct rspamd_task *task,                     \
 											gpointer runtime,                             \
diff --git a/src/libstat/backends/cdb_backend.cxx b/src/libstat/backends/cdb_backend.cxx
index 81d87f319..7bdbcb394 100644
--- a/src/libstat/backends/cdb_backend.cxx
+++ b/src/libstat/backends/cdb_backend.cxx
@@ -380,7 +380,7 @@ rspamd_cdb_runtime(struct rspamd_task *task,
 				   struct rspamd_statfile_config *stcf,
 				   gboolean learn,
 				   gpointer ctx,
-				   gint _id)
+				   int _id)
 {
 	/* In CDB we don't have any dynamic stuff */
 	return ctx;
@@ -389,7 +389,7 @@ rspamd_cdb_runtime(struct rspamd_task *task,
 gboolean
 rspamd_cdb_process_tokens(struct rspamd_task *task,
 						  GPtrArray *tokens,
-						  gint id,
+						  int id,
 						  gpointer runtime)
 {
 	auto *cdbp = CDB_FROM_RAW(runtime);
@@ -431,7 +431,7 @@ rspamd_cdb_finalize_process(struct rspamd_task *task,
 gboolean
 rspamd_cdb_learn_tokens(struct rspamd_task *task,
 						GPtrArray *tokens,
-						gint id,
+						int id,
 						gpointer ctx)
 {
 	return false;
diff --git a/src/libstat/backends/http_backend.cxx b/src/libstat/backends/http_backend.cxx
index 075e50870..d71e4b3ad 100644
--- a/src/libstat/backends/http_backend.cxx
+++ b/src/libstat/backends/http_backend.cxx
@@ -91,7 +91,7 @@ public:
 
 	auto process_tokens(struct rspamd_task *task,
 						GPtrArray *tokens,
-						gint id,
+						int id,
 						bool learn) -> bool;
 
 private:
@@ -158,7 +158,7 @@ auto http_backend_runtime::create(struct rspamd_task *task, bool is_learn) -> ht
 	return new (allocated_runtime) http_backend_runtime{task, is_learn};
 }
 
-auto http_backend_runtime::process_tokens(struct rspamd_task *task, GPtrArray *tokens, gint id, bool learn) -> bool
+auto http_backend_runtime::process_tokens(struct rspamd_task *task, GPtrArray *tokens, int id, bool learn) -> bool
 {
 	if (!learn) {
 		if (id == seen_statfiles.size() - 1) {
@@ -322,7 +322,7 @@ rspamd_http_runtime(struct rspamd_task *task,
 					struct rspamd_statfile_config *stcf,
 					gboolean learn,
 					gpointer ctx,
-					gint id)
+					int id)
 {
 	auto maybe_existing = rspamd_mempool_get_variable(task->task_pool, RSPAMD_MEMPOOL_HTTP_STAT_BACKEND_RUNTIME);
 
@@ -347,7 +347,7 @@ rspamd_http_runtime(struct rspamd_task *task,
 gboolean
 rspamd_http_process_tokens(struct rspamd_task *task,
 						   GPtrArray *tokens,
-						   gint id,
+						   int id,
 						   gpointer runtime)
 {
 	auto real_runtime = (rspamd::stat::http::http_backend_runtime *) runtime;
@@ -371,7 +371,7 @@ rspamd_http_finalize_process(struct rspamd_task *task,
 gboolean
 rspamd_http_learn_tokens(struct rspamd_task *task,
 						 GPtrArray *tokens,
-						 gint id,
+						 int id,
 						 gpointer runtime)
 {
 	auto real_runtime = (rspamd::stat::http::http_backend_runtime *) runtime;
diff --git a/src/libstat/backends/mmaped_file.c b/src/libstat/backends/mmaped_file.c
index f4354d8e1..4430bb9a4 100644
--- a/src/libstat/backends/mmaped_file.c
+++ b/src/libstat/backends/mmaped_file.c
@@ -1,11 +1,11 @@
-/*-
- * Copyright 2016 Vsevolod Stakhov
+/*
+ * Copyright 2024 Vsevolod Stakhov
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -69,12 +69,12 @@ struct stat_file {
  */
 typedef struct {
 #ifdef HAVE_PATH_MAX
-	gchar filename[PATH_MAX]; /**< name of file						*/
+	char filename[PATH_MAX]; /**< name of file						*/
 #else
-	gchar filename[MAXPATHLEN]; /**< name of file						*/
+	char filename[MAXPATHLEN]; /**< name of file						*/
 #endif
 	rspamd_mempool_t *pool;
-	gint fd;                              /**< descriptor							*/
+	int fd;                               /**< descriptor							*/
 	void *map;                            /**< mmaped area						*/
 	off_t seek_pos;                       /**< current seek position				*/
 	struct stat_file_section cur_section; /**< current section					*/
@@ -94,13 +94,13 @@ static void rspamd_mmaped_file_set_block_common(rspamd_mempool_t *pool,
 												uint32_t h1, uint32_t h2, double value);
 
 rspamd_mmaped_file_t *rspamd_mmaped_file_open(rspamd_mempool_t *pool,
-											  const gchar *filename, size_t size,
+											  const char *filename, size_t size,
 											  struct rspamd_statfile_config *stcf);
-gint rspamd_mmaped_file_create(const gchar *filename, size_t size,
-							   struct rspamd_statfile_config *stcf,
-							   rspamd_mempool_t *pool);
-gint rspamd_mmaped_file_close_file(rspamd_mempool_t *pool,
-								   rspamd_mmaped_file_t *file);
+int rspamd_mmaped_file_create(const char *filename, size_t size,
+							  struct rspamd_statfile_config *stcf,
+							  rspamd_mempool_t *pool);
+int rspamd_mmaped_file_close_file(rspamd_mempool_t *pool,
+								  rspamd_mmaped_file_t *file);
 
 double
 rspamd_mmaped_file_get_block(rspamd_mmaped_file_t *file,
@@ -108,7 +108,7 @@ rspamd_mmaped_file_get_block(rspamd_mmaped_file_t *file,
 							 uint32_t h2)
 {
 	struct stat_file_block *block;
-	guint i, blocknum;
+	unsigned int i, blocknum;
 	u_char *c;
 
 	if (!file->map) {
@@ -141,7 +141,7 @@ rspamd_mmaped_file_set_block_common(rspamd_mempool_t *pool,
 {
 	struct stat_file_block *block, *to_expire = NULL;
 	struct stat_file_header *header;
-	guint i, blocknum;
+	unsigned int i, blocknum;
 	u_char *c;
 	double min = G_MAXDOUBLE;
 
@@ -327,12 +327,12 @@ rspamd_mmaped_file_get_total(rspamd_mmaped_file_t *file)
 }
 
 /* Check whether specified file is statistic file and calculate its len in blocks */
-static gint
+static int
 rspamd_mmaped_file_check(rspamd_mempool_t *pool, rspamd_mmaped_file_t *file)
 {
 	struct stat_file *f;
-	gchar *c;
-	static gchar valid_version[] = RSPAMD_STATFILE_VERSION;
+	char *c;
+	static char valid_version[] = RSPAMD_STATFILE_VERSION;
 
 
 	if (!file || !file->map) {
@@ -388,13 +388,13 @@ rspamd_mmaped_file_check(rspamd_mempool_t *pool, rspamd_mmaped_file_t *file)
 
 static rspamd_mmaped_file_t *
 rspamd_mmaped_file_reindex(rspamd_mempool_t *pool,
-						   const gchar *filename,
+						   const char *filename,
 						   size_t old_size,
 						   size_t size,
 						   struct rspamd_statfile_config *stcf)
 {
-	gchar *backup, *lock;
-	gint fd, lock_fd;
+	char *backup, *lock;
+	int fd, lock_fd;
 	rspamd_mmaped_file_t *new, *old = NULL;
 	u_char *map, *pos;
 	struct stat_file_block *block;
@@ -527,12 +527,12 @@ rspamd_mmaped_file_reindex(rspamd_mempool_t *pool,
 static void
 rspamd_mmaped_file_preload(rspamd_mmaped_file_t *file)
 {
-	guint8 *pos, *end;
-	volatile guint8 t;
+	uint8_t *pos, *end;
+	volatile uint8_t t;
 	gsize size;
 
-	pos = (guint8 *) file->map;
-	end = (guint8 *) file->map + file->len;
+	pos = (uint8_t *) file->map;
+	end = (uint8_t *) file->map + file->len;
 
 	if (madvise(pos, end - pos, MADV_SEQUENTIAL) == -1) {
 		msg_info("madvise failed: %s", strerror(errno));
@@ -554,13 +554,13 @@ rspamd_mmaped_file_preload(rspamd_mmaped_file_t *file)
 
 rspamd_mmaped_file_t *
 rspamd_mmaped_file_open(rspamd_mempool_t *pool,
-						const gchar *filename, size_t size,
+						const char *filename, size_t size,
 						struct rspamd_statfile_config *stcf)
 {
 	struct stat st;
 	rspamd_mmaped_file_t *new_file;
-	gchar *lock;
-	gint lock_fd;
+	char *lock;
+	int lock_fd;
 
 	lock = g_strconcat(filename, ".lock", NULL);
 	lock_fd = open(lock, O_WRONLY | O_CREAT | O_EXCL, 00600);
@@ -649,8 +649,8 @@ rspamd_mmaped_file_open(rspamd_mempool_t *pool,
 	return new_file;
 }
 
-gint rspamd_mmaped_file_close_file(rspamd_mempool_t *pool,
-								   rspamd_mmaped_file_t *file)
+int rspamd_mmaped_file_close_file(rspamd_mempool_t *pool,
+								  rspamd_mmaped_file_t *file)
 {
 	if (file->map) {
 		msg_info_pool("syncing statfile %s", file->filename);
@@ -666,10 +666,10 @@ gint rspamd_mmaped_file_close_file(rspamd_mempool_t *pool,
 	return 0;
 }
 
-gint rspamd_mmaped_file_create(const gchar *filename,
-							   size_t size,
-							   struct rspamd_statfile_config *stcf,
-							   rspamd_mempool_t *pool)
+int rspamd_mmaped_file_create(const char *filename,
+							  size_t size,
+							  struct rspamd_statfile_config *stcf,
+							  rspamd_mempool_t *pool)
 {
 	struct stat_file_header header = {
 		.magic = {'r', 's', 'd'},
@@ -683,9 +683,9 @@ gint rspamd_mmaped_file_create(const gchar *filename,
 	};
 	struct stat_file_block block = {0, 0, 0};
 	struct rspamd_stat_tokenizer *tokenizer;
-	gint fd, lock_fd;
-	guint buflen = 0, nblocks;
-	gchar *buf = NULL, *lock;
+	int fd, lock_fd;
+	unsigned int buflen = 0, nblocks;
+	char *buf = NULL, *lock;
 	struct stat sb;
 	gpointer tok_conf;
 	gsize tok_conf_len;
@@ -855,7 +855,7 @@ rspamd_mmaped_file_init(struct rspamd_stat_ctx *ctx,
 	struct rspamd_statfile_config *stf = st->stcf;
 	rspamd_mmaped_file_t *mf;
 	const ucl_object_t *filenameo, *sizeo;
-	const gchar *filename;
+	const char *filename;
 	gsize size;
 
 	filenameo = ucl_object_lookup(stf->opts, "filename");
@@ -931,7 +931,7 @@ rspamd_mmaped_file_runtime(struct rspamd_task *task,
 						   struct rspamd_statfile_config *stcf,
 						   gboolean learn,
 						   gpointer p,
-						   gint _id)
+						   int _id)
 {
 	rspamd_mmaped_file_t *mf = p;
 
@@ -940,21 +940,21 @@ rspamd_mmaped_file_runtime(struct rspamd_task *task,
 
 gboolean
 rspamd_mmaped_file_process_tokens(struct rspamd_task *task, GPtrArray *tokens,
-								  gint id,
+								  int id,
 								  gpointer p)
 {
 	rspamd_mmaped_file_t *mf = p;
 	uint32_t h1, h2;
 	rspamd_token_t *tok;
-	guint i;
+	unsigned int i;
 
 	g_assert(tokens != NULL);
 	g_assert(p != NULL);
 
 	for (i = 0; i < tokens->len; i++) {
 		tok = g_ptr_array_index(tokens, i);
-		memcpy(&h1, (guchar *) &tok->data, sizeof(h1));
-		memcpy(&h2, ((guchar *) &tok->data) + sizeof(h1), sizeof(h2));
+		memcpy(&h1, (unsigned char *) &tok->data, sizeof(h1));
+		memcpy(&h2, ((unsigned char *) &tok->data) + sizeof(h1), sizeof(h2));
 		tok->values[id] = rspamd_mmaped_file_get_block(mf, h1, h2);
 	}
 
@@ -970,21 +970,21 @@ rspamd_mmaped_file_process_tokens(struct rspamd_task *task, GPtrArray *tokens,
 
 gboolean
 rspamd_mmaped_file_learn_tokens(struct rspamd_task *task, GPtrArray *tokens,
-								gint id,
+								int id,
 								gpointer p)
 {
 	rspamd_mmaped_file_t *mf = p;
 	uint32_t h1, h2;
 	rspamd_token_t *tok;
-	guint i;
+	unsigned int i;
 
 	g_assert(tokens != NULL);
 	g_assert(p != NULL);
 
 	for (i = 0; i < tokens->len; i++) {
 		tok = g_ptr_array_index(tokens, i);
-		memcpy(&h1, (guchar *) &tok->data, sizeof(h1));
-		memcpy(&h2, ((guchar *) &tok->data) + sizeof(h1), sizeof(h2));
+		memcpy(&h1, (unsigned char *) &tok->data, sizeof(h1));
+		memcpy(&h2, ((unsigned char *) &tok->data) + sizeof(h1), sizeof(h2));
 		rspamd_mmaped_file_set_block(task->task_pool, mf, h1, h2,
 									 tok->values[id]);
 	}
diff --git a/src/libstat/backends/redis_backend.cxx b/src/libstat/backends/redis_backend.cxx
index 630c895a2..6abcfa122 100644
--- a/src/libstat/backends/redis_backend.cxx
+++ b/src/libstat/backends/redis_backend.cxx
@@ -169,7 +169,7 @@ public:
 
 #define GET_TASK_ELT(task, elt) (task == nullptr ? nullptr : (task)->elt)
 
-static const gchar *M = "redis statistics";
+static const char *M = "redis statistics";
 
 static GQuark
 rspamd_redis_stat_quark(void)
@@ -180,14 +180,14 @@ rspamd_redis_stat_quark(void)
 /*
  * Non-static for lua unit testing
  */
-gsize rspamd_redis_expand_object(const gchar *pattern,
+gsize rspamd_redis_expand_object(const char *pattern,
 								 struct redis_stat_ctx *ctx,
 								 struct rspamd_task *task,
-								 gchar **target)
+								 char **target)
 {
 	gsize tlen = 0;
-	const gchar *p = pattern, *elt;
-	gchar *d, *end;
+	const char *p = pattern, *elt;
+	char *d, *end;
 	enum {
 		just_char,
 		percent_char,
@@ -196,8 +196,8 @@ gsize rspamd_redis_expand_object(const gchar *pattern,
 	struct rspamd_statfile_config *stcf;
 	lua_State *L = nullptr;
 	struct rspamd_task **ptask;
-	const gchar *rcpt = nullptr;
-	gint err_idx;
+	const char *rcpt = nullptr;
+	int err_idx;
 
 	g_assert(ctx != nullptr);
 	g_assert(task != nullptr);
@@ -315,7 +315,7 @@ gsize rspamd_redis_expand_object(const gchar *pattern,
 		return -1;
 	}
 
-	*target = (gchar *) rspamd_mempool_alloc(task->task_pool, tlen + 1);
+	*target = (char *) rspamd_mempool_alloc(task->task_pool, tlen + 1);
 	d = *target;
 	end = d + tlen + 1;
 	d[tlen] = '\0';
@@ -441,7 +441,7 @@ rspamd_redis_parse_classifier_opts(struct redis_stat_ctx *backend,
 								   const ucl_object_t *classifier_obj,
 								   struct rspamd_config *cfg)
 {
-	const gchar *lua_script;
+	const char *lua_script;
 	const ucl_object_t *elt, *users_enabled;
 	auto *L = RSPAMD_LUA_CFG_STATE(cfg);
 
@@ -590,7 +590,7 @@ rspamd_redis_init(struct rspamd_stat_ctx *ctx,
 gpointer
 rspamd_redis_runtime(struct rspamd_task *task,
 					 struct rspamd_statfile_config *stcf,
-					 gboolean learn, gpointer c, gint _id)
+					 gboolean learn, gpointer c, int _id)
 {
 	struct redis_stat_ctx *ctx = REDIS_CTX(c);
 	char *object_expanded = nullptr;
@@ -708,7 +708,7 @@ msgpack_str_len(std::size_t len) -> std::size_t
  * Serialise stat tokens to message pack
  */
 static char *
-rspamd_redis_serialize_tokens(struct rspamd_task *task, const gchar *prefix, GPtrArray *tokens, gsize *ser_len)
+rspamd_redis_serialize_tokens(struct rspamd_task *task, const char *prefix, GPtrArray *tokens, gsize *ser_len)
 {
 	/* Each token is int64_t that requires 10 bytes (2 int32_t) + 4 bytes array len + 1 byte array magic */
 	char max_int64_str[] = "18446744073709551615";
@@ -719,16 +719,16 @@ rspamd_redis_serialize_tokens(struct rspamd_task *task, const gchar *prefix, GPt
 	/* Calculate required length */
 	req_len += tokens->len * (msgpack_str_len(sizeof(max_int64_str) + prefix_len) + 1);
 
-	auto *buf = (gchar *) rspamd_mempool_alloc(task->task_pool, req_len);
+	auto *buf = (char *) rspamd_mempool_alloc(task->task_pool, req_len);
 	auto *p = buf;
 
 	/* Array */
-	*p++ = (gchar) 0xdd;
+	*p++ = (char) 0xdd;
 	/* Length in big-endian (4 bytes) */
-	*p++ = (gchar) ((tokens->len >> 24) & 0xff);
-	*p++ = (gchar) ((tokens->len >> 16) & 0xff);
-	*p++ = (gchar) ((tokens->len >> 8) & 0xff);
-	*p++ = (gchar) (tokens->len & 0xff);
+	*p++ = (char) ((tokens->len >> 24) & 0xff);
+	*p++ = (char) ((tokens->len >> 16) & 0xff);
+	*p++ = (char) ((tokens->len >> 8) & 0xff);
+	*p++ = (char) (tokens->len & 0xff);
 
 
 	int i;
@@ -772,13 +772,13 @@ rspamd_redis_serialize_text_tokens(struct rspamd_task *task, GPtrArray *tokens,
 		}
 	}
 
-	auto *buf = (gchar *) rspamd_mempool_alloc(task->task_pool, req_len);
+	auto *buf = (char *) rspamd_mempool_alloc(task->task_pool, req_len);
 	auto *p = buf;
 
 	/* Array */
 	std::uint32_t nlen = tokens->len * 2;
 	nlen = GUINT32_TO_BE(nlen);
-	*p++ = (gchar) 0xdd;
+	*p++ = (char) 0xdd;
 	/* Length in big-endian (4 bytes) */
 	memcpy(p, &nlen, sizeof(nlen));
 	p += sizeof(nlen);
@@ -807,7 +807,7 @@ rspamd_redis_serialize_text_tokens(struct rspamd_task *task, GPtrArray *tokens,
 	return buf;
 }
 
-static gint
+static int
 rspamd_redis_classified(lua_State *L)
 {
 	const auto *cookie = lua_tostring(L, lua_upvalueindex(1));
@@ -895,7 +895,7 @@ rspamd_redis_classified(lua_State *L)
 gboolean
 rspamd_redis_process_tokens(struct rspamd_task *task,
 							GPtrArray *tokens,
-							gint id, gpointer p)
+							int id, gpointer p)
 {
 	auto *rt = REDIS_RUNTIME(p);
 	auto *L = rt->ctx->L;
@@ -918,11 +918,11 @@ rspamd_redis_process_tokens(struct rspamd_task *task,
 	}
 
 	gsize tokens_len;
-	gchar *tokens_buf = rspamd_redis_serialize_tokens(task, rt->redis_object_expanded, tokens, &tokens_len);
+	char *tokens_buf = rspamd_redis_serialize_tokens(task, rt->redis_object_expanded, tokens, &tokens_len);
 	rt->id = id;
 
 	lua_pushcfunction(L, &rspamd_lua_traceback);
-	gint err_idx = lua_gettop(L);
+	int err_idx = lua_gettop(L);
 
 	/* Function arguments */
 	lua_rawgeti(L, LUA_REGISTRYINDEX, rt->ctx->cbref_classify);
@@ -963,7 +963,7 @@ rspamd_redis_finalize_process(struct rspamd_task *task, gpointer runtime,
 }
 
 
-static gint
+static int
 rspamd_redis_learned(lua_State *L)
 {
 	const auto *cookie = lua_tostring(L, lua_upvalueindex(1));
@@ -994,7 +994,7 @@ rspamd_redis_learned(lua_State *L)
 gboolean
 rspamd_redis_learn_tokens(struct rspamd_task *task,
 						  GPtrArray *tokens,
-						  gint id, gpointer p)
+						  int id, gpointer p)
 {
 	auto *rt = REDIS_RUNTIME(p);
 	auto *L = rt->ctx->L;
@@ -1008,19 +1008,19 @@ rspamd_redis_learn_tokens(struct rspamd_task *task,
 	}
 
 	gsize tokens_len;
-	gchar *tokens_buf = rspamd_redis_serialize_tokens(task, rt->redis_object_expanded, tokens, &tokens_len);
+	char *tokens_buf = rspamd_redis_serialize_tokens(task, rt->redis_object_expanded, tokens, &tokens_len);
 
 	rt->id = id;
 
 	gsize text_tokens_len = 0;
-	gchar *text_tokens_buf = nullptr;
+	char *text_tokens_buf = nullptr;
 
 	if (rt->ctx->store_tokens) {
 		text_tokens_buf = rspamd_redis_serialize_text_tokens(task, tokens, &text_tokens_len);
 	}
 
 	lua_pushcfunction(L, &rspamd_lua_traceback);
-	gint err_idx = lua_gettop(L);
+	int err_idx = lua_gettop(L);
 	auto nargs = 8;
 
 	/* Function arguments */
diff --git a/src/libstat/backends/sqlite3_backend.c b/src/libstat/backends/sqlite3_backend.c
index b26c1a86f..973dc30a7 100644
--- a/src/libstat/backends/sqlite3_backend.c
+++ b/src/libstat/backends/sqlite3_backend.c
@@ -28,15 +28,15 @@
 
 struct rspamd_stat_sqlite3_db {
 	sqlite3 *sqlite;
-	gchar *fname;
+	char *fname;
 	GArray *prstmt;
 	lua_State *L;
 	rspamd_mempool_t *pool;
 	gboolean in_transaction;
 	gboolean enable_users;
 	gboolean enable_languages;
-	gint cbref_user;
-	gint cbref_language;
+	int cbref_user;
+	int cbref_language;
 };
 
 struct rspamd_stat_sqlite3_rt {
@@ -161,8 +161,8 @@ rspamd_sqlite3_get_user(struct rspamd_stat_sqlite3_db *db,
 						struct rspamd_task *task, gboolean learn)
 {
 	int64_t id = 0; /* Default user is 0 */
-	gint rc, err_idx;
-	const gchar *user = NULL;
+	int rc, err_idx;
+	const char *user = NULL;
 	struct rspamd_task **ptask;
 	lua_State *L = db->L;
 
@@ -220,9 +220,9 @@ rspamd_sqlite3_get_language(struct rspamd_stat_sqlite3_db *db,
 							struct rspamd_task *task, gboolean learn)
 {
 	int64_t id = 0; /* Default language is 0 */
-	gint rc, err_idx;
-	guint i;
-	const gchar *language = NULL;
+	int rc, err_idx;
+	unsigned int i;
+	const char *language = NULL;
 	struct rspamd_mime_text_part *tp;
 	struct rspamd_task **ptask;
 	lua_State *L = db->L;
@@ -286,7 +286,7 @@ rspamd_sqlite3_get_language(struct rspamd_stat_sqlite3_db *db,
 static struct rspamd_stat_sqlite3_db *
 rspamd_sqlite3_opendb(rspamd_mempool_t *pool,
 					  struct rspamd_statfile_config *stcf,
-					  const gchar *path, const ucl_object_t *opts,
+					  const char *path, const ucl_object_t *opts,
 					  gboolean create, GError **err)
 {
 	struct rspamd_stat_sqlite3_db *bk;
@@ -294,9 +294,9 @@ rspamd_sqlite3_opendb(rspamd_mempool_t *pool,
 	gpointer tk_conf;
 	gsize sz = 0;
 	int64_t sz64 = 0;
-	gchar *tok_conf_encoded;
-	gint ret, ntries = 0;
-	const gint max_tries = 100;
+	char *tok_conf_encoded;
+	int ret, ntries = 0;
+	const int max_tries = 100;
 	struct timespec sleep_ts = {
 		.tv_sec = 0,
 		.tv_nsec = 1000000};
@@ -375,7 +375,7 @@ rspamd_sqlite3_init(struct rspamd_stat_ctx *ctx,
 	struct rspamd_classifier_config *clf = st->classifier->cfg;
 	struct rspamd_statfile_config *stf = st->stcf;
 	const ucl_object_t *filenameo, *lang_enabled, *users_enabled;
-	const gchar *filename, *lua_script;
+	const char *filename, *lua_script;
 	struct rspamd_stat_sqlite3_db *bk;
 	GError *err = NULL;
 
@@ -502,7 +502,7 @@ void rspamd_sqlite3_close(gpointer p)
 
 gpointer
 rspamd_sqlite3_runtime(struct rspamd_task *task,
-					   struct rspamd_statfile_config *stcf, gboolean learn, gpointer p, gint _id)
+					   struct rspamd_statfile_config *stcf, gboolean learn, gpointer p, int _id)
 {
 	struct rspamd_stat_sqlite3_rt *rt = NULL;
 	struct rspamd_stat_sqlite3_db *bk = p;
@@ -522,12 +522,12 @@ rspamd_sqlite3_runtime(struct rspamd_task *task,
 gboolean
 rspamd_sqlite3_process_tokens(struct rspamd_task *task,
 							  GPtrArray *tokens,
-							  gint id, gpointer p)
+							  int id, gpointer p)
 {
 	struct rspamd_stat_sqlite3_db *bk;
 	struct rspamd_stat_sqlite3_rt *rt = p;
 	int64_t iv = 0;
-	guint i;
+	unsigned int i;
 	rspamd_token_t *tok;
 
 	g_assert(p != NULL);
@@ -625,12 +625,12 @@ rspamd_sqlite3_finalize_process(struct rspamd_task *task, gpointer runtime,
 
 gboolean
 rspamd_sqlite3_learn_tokens(struct rspamd_task *task, GPtrArray *tokens,
-							gint id, gpointer p)
+							int id, gpointer p)
 {
 	struct rspamd_stat_sqlite3_db *bk;
 	struct rspamd_stat_sqlite3_rt *rt = p;
 	int64_t iv = 0;
-	guint i;
+	unsigned int i;
 	rspamd_token_t *tok;
 
 	g_assert(tokens != NULL);
@@ -691,7 +691,7 @@ rspamd_sqlite3_finalize_learn(struct rspamd_task *task, gpointer runtime,
 {
 	struct rspamd_stat_sqlite3_rt *rt = runtime;
 	struct rspamd_stat_sqlite3_db *bk;
-	gint wal_frames, wal_checkpointed, mode;
+	int wal_frames, wal_checkpointed, mode;
 
 	g_assert(rt != NULL);
 	bk = rt->db;