[Minor] Cleanup various stuff

1 files changed, 49 insertions, 49 deletions

diff --git a/src/libserver/task.h b/src/libserver/task.h
index b97f91eb4..763866987 100644
--- a/src/libserver/task.h
+++ b/src/libserver/task.h
@@ -37,24 +37,24 @@ enum rspamd_command {
 };
 
 enum rspamd_task_stage {
-	RSPAMD_TASK_STAGE_CONNECT = (1 << 0),
-	RSPAMD_TASK_STAGE_ENVELOPE = (1 << 1),
-	RSPAMD_TASK_STAGE_READ_MESSAGE = (1 << 2),
-	RSPAMD_TASK_STAGE_PRE_FILTERS = (1 << 3),
-	RSPAMD_TASK_STAGE_PROCESS_MESSAGE = (1 << 4),
-	RSPAMD_TASK_STAGE_FILTERS = (1 << 5),
-	RSPAMD_TASK_STAGE_CLASSIFIERS_PRE = (1 << 6),
-	RSPAMD_TASK_STAGE_CLASSIFIERS = (1 << 7),
-	RSPAMD_TASK_STAGE_CLASSIFIERS_POST = (1 << 8),
-	RSPAMD_TASK_STAGE_COMPOSITES = (1 << 9),
-	RSPAMD_TASK_STAGE_POST_FILTERS = (1 << 10),
-	RSPAMD_TASK_STAGE_LEARN_PRE = (1 << 11),
-	RSPAMD_TASK_STAGE_LEARN = (1 << 12),
-	RSPAMD_TASK_STAGE_LEARN_POST = (1 << 13),
-	RSPAMD_TASK_STAGE_COMPOSITES_POST = (1 << 14),
-	RSPAMD_TASK_STAGE_IDEMPOTENT = (1 << 15),
-	RSPAMD_TASK_STAGE_DONE = (1 << 16),
-	RSPAMD_TASK_STAGE_REPLIED = (1 << 17)
+	RSPAMD_TASK_STAGE_CONNECT = (1u << 0u),
+	RSPAMD_TASK_STAGE_ENVELOPE = (1u << 1u),
+	RSPAMD_TASK_STAGE_READ_MESSAGE = (1u << 2u),
+	RSPAMD_TASK_STAGE_PRE_FILTERS = (1u << 3u),
+	RSPAMD_TASK_STAGE_PROCESS_MESSAGE = (1u << 4u),
+	RSPAMD_TASK_STAGE_FILTERS = (1u << 5u),
+	RSPAMD_TASK_STAGE_CLASSIFIERS_PRE = (1u << 6u),
+	RSPAMD_TASK_STAGE_CLASSIFIERS = (1u << 7u),
+	RSPAMD_TASK_STAGE_CLASSIFIERS_POST = (1u << 8u),
+	RSPAMD_TASK_STAGE_COMPOSITES = (1u << 9u),
+	RSPAMD_TASK_STAGE_POST_FILTERS = (1u << 10u),
+	RSPAMD_TASK_STAGE_LEARN_PRE = (1u << 11u),
+	RSPAMD_TASK_STAGE_LEARN = (1u << 12u),
+	RSPAMD_TASK_STAGE_LEARN_POST = (1u << 13u),
+	RSPAMD_TASK_STAGE_COMPOSITES_POST = (1u << 14u),
+	RSPAMD_TASK_STAGE_IDEMPOTENT = (1u << 15u),
+	RSPAMD_TASK_STAGE_DONE = (1u << 16u),
+	RSPAMD_TASK_STAGE_REPLIED = (1u << 17u)
 };
 
 #define RSPAMD_TASK_PROCESS_ALL (RSPAMD_TASK_STAGE_CONNECT | \
@@ -86,37 +86,37 @@ enum rspamd_task_stage {
 		RSPAMD_TASK_STAGE_LEARN_POST | \
 		RSPAMD_TASK_STAGE_DONE)
 
-#define RSPAMD_TASK_FLAG_MIME (1 << 0)
-#define RSPAMD_TASK_FLAG_JSON (1 << 1)
-#define RSPAMD_TASK_FLAG_SKIP_PROCESS (1 << 2)
-#define RSPAMD_TASK_FLAG_SKIP (1 << 3)
-#define RSPAMD_TASK_FLAG_EXT_URLS (1 << 4)
-#define RSPAMD_TASK_FLAG_SPAMC (1 << 5)
-#define RSPAMD_TASK_FLAG_PASS_ALL (1 << 6)
-#define RSPAMD_TASK_FLAG_NO_LOG (1 << 7)
-#define RSPAMD_TASK_FLAG_NO_IP (1 << 8)
-#define RSPAMD_TASK_FLAG_HAS_CONTROL (1 << 9)
-#define RSPAMD_TASK_FLAG_PROCESSING (1 << 10)
-#define RSPAMD_TASK_FLAG_GTUBE (1 << 11)
-#define RSPAMD_TASK_FLAG_FILE (1 << 12)
-#define RSPAMD_TASK_FLAG_NO_STAT (1 << 13)
-#define RSPAMD_TASK_FLAG_UNLEARN (1 << 14)
-#define RSPAMD_TASK_FLAG_ALREADY_LEARNED (1 << 15)
-#define RSPAMD_TASK_FLAG_LEARN_SPAM (1 << 16)
-#define RSPAMD_TASK_FLAG_LEARN_HAM (1 << 17)
-#define RSPAMD_TASK_FLAG_LEARN_AUTO (1 << 18)
-#define RSPAMD_TASK_FLAG_BROKEN_HEADERS (1 << 19)
-#define RSPAMD_TASK_FLAG_HAS_SPAM_TOKENS (1 << 20)
-#define RSPAMD_TASK_FLAG_HAS_HAM_TOKENS (1 << 21)
-#define RSPAMD_TASK_FLAG_EMPTY (1 << 22)
-#define RSPAMD_TASK_FLAG_LOCAL_CLIENT (1 << 23)
-#define RSPAMD_TASK_FLAG_COMPRESSED (1 << 24)
-#define RSPAMD_TASK_FLAG_PROFILE (1 << 25)
-#define RSPAMD_TASK_FLAG_GREYLISTED (1 << 26)
-#define RSPAMD_TASK_FLAG_OWN_POOL (1 << 27)
-#define RSPAMD_TASK_FLAG_MILTER (1 << 28)
-#define RSPAMD_TASK_FLAG_SSL (1 << 29)
-#define RSPAMD_TASK_FLAG_BAD_UNICODE (1 << 30)
+#define RSPAMD_TASK_FLAG_MIME (1u << 0u)
+#define RSPAMD_TASK_FLAG_JSON (1u << 1u)
+#define RSPAMD_TASK_FLAG_SKIP_PROCESS (1u << 2u)
+#define RSPAMD_TASK_FLAG_SKIP (1u << 3u)
+#define RSPAMD_TASK_FLAG_EXT_URLS (1u << 4u)
+#define RSPAMD_TASK_FLAG_SPAMC (1u << 5u)
+#define RSPAMD_TASK_FLAG_PASS_ALL (1u << 6u)
+#define RSPAMD_TASK_FLAG_NO_LOG (1u << 7u)
+#define RSPAMD_TASK_FLAG_NO_IP (1u << 8u)
+#define RSPAMD_TASK_FLAG_HAS_CONTROL (1u << 9u)
+#define RSPAMD_TASK_FLAG_PROCESSING (1u << 10u)
+#define RSPAMD_TASK_FLAG_GTUBE (1u << 11u)
+#define RSPAMD_TASK_FLAG_FILE (1u << 12u)
+#define RSPAMD_TASK_FLAG_NO_STAT (1u << 13u)
+#define RSPAMD_TASK_FLAG_UNLEARN (1u << 14u)
+#define RSPAMD_TASK_FLAG_ALREADY_LEARNED (1u << 15u)
+#define RSPAMD_TASK_FLAG_LEARN_SPAM (1u << 16u)
+#define RSPAMD_TASK_FLAG_LEARN_HAM (1u << 17u)
+#define RSPAMD_TASK_FLAG_LEARN_AUTO (1u << 18u)
+#define RSPAMD_TASK_FLAG_BROKEN_HEADERS (1u << 19u)
+#define RSPAMD_TASK_FLAG_HAS_SPAM_TOKENS (1u << 20u)
+#define RSPAMD_TASK_FLAG_HAS_HAM_TOKENS (1u << 21u)
+#define RSPAMD_TASK_FLAG_EMPTY (1u << 22u)
+#define RSPAMD_TASK_FLAG_LOCAL_CLIENT (1u << 23u)
+#define RSPAMD_TASK_FLAG_COMPRESSED (1u << 24u)
+#define RSPAMD_TASK_FLAG_PROFILE (1u << 25u)
+#define RSPAMD_TASK_FLAG_GREYLISTED (1u << 26u)
+#define RSPAMD_TASK_FLAG_OWN_POOL (1u << 27u)
+#define RSPAMD_TASK_FLAG_MILTER (1u << 28u)
+#define RSPAMD_TASK_FLAG_SSL (1u << 29u)
+#define RSPAMD_TASK_FLAG_BAD_UNICODE (1u << 30u)
 
 #define RSPAMD_TASK_IS_SKIPPED(task) (((task)->flags & RSPAMD_TASK_FLAG_SKIP))
 #define RSPAMD_TASK_IS_JSON(task) (((task)->flags & RSPAMD_TASK_FLAG_JSON))