From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 27 Sep 2021 14:14:45 +0000 (+0100)
Subject: [Minor] Finish transition to signed log id
X-Git-Tag: 3.1~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a9c8de045c362ef662c00a38e1e34865f47d955;p=thirdparty%2Frspamd.git

[Minor] Finish transition to signed log id
---

diff --git a/src/libserver/css/css.hxx b/src/libserver/css/css.hxx
index 2d1ece7576..7768bde553 100644
--- a/src/libserver/css/css.hxx
+++ b/src/libserver/css/css.hxx
@@ -32,7 +32,7 @@ struct html_block;
 
 namespace rspamd::css {
 
-extern unsigned int rspamd_css_log_id;
+extern int rspamd_css_log_id;
 
 #define msg_debug_css(...)  rspamd_conditional_debug_fast (NULL, NULL, \
         rspamd_css_log_id, "css", pool->tag.uid, \
diff --git a/src/libserver/logger.h b/src/libserver/logger.h
index b646aa3fd6..8f1177666d 100644
--- a/src/libserver/logger.h
+++ b/src/libserver/logger.h
@@ -156,14 +156,14 @@ gint rspamd_logger_add_debug_module (const gchar *mod);
  * Macro to use for faster debug modules
  */
 #define INIT_LOG_MODULE(mname) \
-    static guint rspamd_##mname##_log_id = (guint)-1; \
+    static gint rspamd_##mname##_log_id = -1; \
     RSPAMD_CONSTRUCTOR(rspamd_##mname##_log_init) { \
         rspamd_##mname##_log_id = rspamd_logger_add_debug_module(#mname); \
 }
 
 
 #define INIT_LOG_MODULE_PUBLIC(mname) \
-    guint rspamd_##mname##_log_id = (guint)-1; \
+    gint rspamd_##mname##_log_id = -1; \
     RSPAMD_CONSTRUCTOR(rspamd_##mname##_log_init) { \
         rspamd_##mname##_log_id = rspamd_logger_add_debug_module(#mname); \
 }
@@ -179,17 +179,17 @@ bool rspamd_conditional_debug (rspamd_logger_t *logger,
 
 bool rspamd_conditional_debug_fast (rspamd_logger_t *logger,
 									rspamd_inet_addr_t *addr,
-									guint mod_id,
+									gint mod_id,
 									const gchar *module, const gchar *id,
 									const gchar *function, const gchar *fmt, ...);
 bool rspamd_conditional_debug_fast_num_id (rspamd_logger_t *logger,
 									rspamd_inet_addr_t *addr,
-									guint mod_id,
+									gint mod_id,
 									const gchar *module, guint64 id,
 									const gchar *function, const gchar *fmt, ...);
 gboolean rspamd_logger_need_log (rspamd_logger_t *rspamd_log,
 								 GLogLevelFlags log_level,
-								 guint module_id);
+								 gint module_id);
 
 /**
  * Function with variable number of arguments support that uses static default logger
diff --git a/src/libserver/logger/logger.c b/src/libserver/logger/logger.c
index 4fdfd3cbaf..846c6d3a9e 100644
--- a/src/libserver/logger/logger.c
+++ b/src/libserver/logger/logger.c
@@ -319,7 +319,7 @@ rspamd_log_on_fork (GQuark ptype, struct rspamd_config *cfg,
 
 inline gboolean
 rspamd_logger_need_log (rspamd_logger_t *rspamd_log, GLogLevelFlags log_level,
-		guint module_id)
+		gint module_id)
 {
 	g_assert (rspamd_log != NULL);
 
@@ -328,7 +328,7 @@ rspamd_logger_need_log (rspamd_logger_t *rspamd_log, GLogLevelFlags log_level,
 		return TRUE;
 	}
 
-	if (module_id != (guint)-1 && isset (log_modules->bitset, module_id)) {
+	if (module_id != -1 && isset (log_modules->bitset, module_id)) {
 		return TRUE;
 	}
 
@@ -582,7 +582,7 @@ rspamd_conditional_debug (rspamd_logger_t *rspamd_log,
 	static gchar logbuf[LOGBUF_LEN];
 	va_list vp;
 	gchar *end;
-	guint mod_id;
+	gint mod_id;
 
 	if (rspamd_log == NULL) {
 		rspamd_log = default_logger;
@@ -618,7 +618,7 @@ rspamd_conditional_debug (rspamd_logger_t *rspamd_log,
 bool
 rspamd_conditional_debug_fast (rspamd_logger_t *rspamd_log,
 		rspamd_inet_addr_t *addr,
-		guint mod_id, const gchar *module, const gchar *id,
+		gint mod_id, const gchar *module, const gchar *id,
 		const gchar *function, const gchar *fmt, ...)
 {
 	static gchar logbuf[LOGBUF_LEN];
@@ -657,7 +657,7 @@ rspamd_conditional_debug_fast (rspamd_logger_t *rspamd_log,
 bool
 rspamd_conditional_debug_fast_num_id (rspamd_logger_t *rspamd_log,
 							   rspamd_inet_addr_t *addr,
-							   guint mod_id, const gchar *module, guint64 id,
+							   gint mod_id, const gchar *module, guint64 id,
 							   const gchar *function, const gchar *fmt, ...)
 {
 	static gchar logbuf[LOGBUF_LEN], idbuf[64];
diff --git a/src/libstat/classifiers/classifiers.h b/src/libstat/classifiers/classifiers.h
index 4e159fb134..32473cdd1f 100644
--- a/src/libstat/classifiers/classifiers.h
+++ b/src/libstat/classifiers/classifiers.h
@@ -75,7 +75,7 @@ gboolean lua_classifier_learn_spam (struct rspamd_classifier *ctx,
 									gboolean unlearn,
 									GError **err);
 
-extern guint rspamd_bayes_log_id;
+extern gint rspamd_bayes_log_id;
 #define msg_debug_bayes(...)  rspamd_conditional_debug_fast (NULL, task->from_addr, \
         rspamd_bayes_log_id, "bayes", task->task_pool->tag.uid, \
         G_STRFUNC, \