aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@rspamd.com>2023-09-05 15:01:18 +0100
committerVsevolod Stakhov <vsevolod@rspamd.com>2023-09-05 15:01:18 +0100
commit509dad33dddfda31c889dfa4849f3053e24c4c1e (patch)
tree7c71f36dc1f18481946a06c5dfbfff5d23199749 /src
parent96db4ae5cefb95d0b59eef88e358975767899785 (diff)
downloadrspamd-509dad33dddfda31c889dfa4849f3053e24c4c1e.tar.gz
rspamd-509dad33dddfda31c889dfa4849f3053e24c4c1e.zip
[Minor] Learn to cycle back on unsigned
Diffstat (limited to 'src')
-rw-r--r--src/libserver/rspamd_symcache.h2
-rw-r--r--src/libserver/symcache/symcache_c.cxx2
-rw-r--r--src/libserver/symcache/symcache_runtime.cxx10
-rw-r--r--src/libserver/symcache/symcache_runtime.hxx10
-rw-r--r--src/libserver/task.c2
5 files changed, 13 insertions, 13 deletions
diff --git a/src/libserver/rspamd_symcache.h b/src/libserver/rspamd_symcache.h
index 45e460c11..2c67cba0d 100644
--- a/src/libserver/rspamd_symcache.h
+++ b/src/libserver/rspamd_symcache.h
@@ -209,7 +209,7 @@ gboolean rspamd_symcache_validate(struct rspamd_symcache *cache,
*/
gboolean rspamd_symcache_process_symbols(struct rspamd_task *task,
struct rspamd_symcache *cache,
- gint stage);
+ guint stage);
/**
* Return statistics about the cache as ucl object (array of objects one per item)
diff --git a/src/libserver/symcache/symcache_c.cxx b/src/libserver/symcache/symcache_c.cxx
index 06801d244..6a7e41cc9 100644
--- a/src/libserver/symcache/symcache_c.cxx
+++ b/src/libserver/symcache/symcache_c.cxx
@@ -687,7 +687,7 @@ void rspamd_symcache_composites_foreach(struct rspamd_task *task,
gboolean
rspamd_symcache_process_symbols(struct rspamd_task *task,
struct rspamd_symcache *cache,
- gint stage)
+ guint stage)
{
auto *real_cache = C_API_SYMCACHE(cache);
diff --git a/src/libserver/symcache/symcache_runtime.cxx b/src/libserver/symcache/symcache_runtime.cxx
index b4da5a888..d9622d8a2 100644
--- a/src/libserver/symcache/symcache_runtime.cxx
+++ b/src/libserver/symcache/symcache_runtime.cxx
@@ -1,11 +1,11 @@
-/*-
- * Copyright 2022 Vsevolod Stakhov
+/*
+ * Copyright 2023 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,
@@ -279,7 +279,7 @@ auto symcache_runtime::get_dynamic_item(int id) const -> cache_dynamic_item *
return nullptr;
}
-auto symcache_runtime::process_symbols(struct rspamd_task *task, symcache &cache, int stage) -> bool
+auto symcache_runtime::process_symbols(struct rspamd_task *task, symcache &cache, unsigned int stage) -> bool
{
msg_debug_cache_task("symbols processing stage at pass: %d", stage);
@@ -308,7 +308,7 @@ auto symcache_runtime::process_symbols(struct rspamd_task *task, symcache &cache
auto symcache_runtime::process_pre_postfilters(struct rspamd_task *task,
symcache &cache,
int start_events,
- int stage) -> bool
+ unsigned int stage) -> bool
{
auto saved_priority = std::numeric_limits<int>::min();
auto all_done = true;
diff --git a/src/libserver/symcache/symcache_runtime.hxx b/src/libserver/symcache/symcache_runtime.hxx
index 91fe1c783..aa8f66c0f 100644
--- a/src/libserver/symcache/symcache_runtime.hxx
+++ b/src/libserver/symcache/symcache_runtime.hxx
@@ -1,11 +1,11 @@
-/*-
- * Copyright 2022 Vsevolod Stakhov
+/*
+ * Copyright 2023 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,
@@ -64,7 +64,7 @@ class symcache_runtime {
auto process_symbol(struct rspamd_task *task, symcache &cache, cache_item *item,
cache_dynamic_item *dyn_item) -> bool;
/* Specific stages of the processing */
- auto process_pre_postfilters(struct rspamd_task *task, symcache &cache, int start_events, int stage) -> bool;
+ auto process_pre_postfilters(struct rspamd_task *task, symcache &cache, int start_events, unsigned int stage) -> bool;
auto process_filters(struct rspamd_task *task, symcache &cache, int start_events) -> bool;
auto check_metric_limit(struct rspamd_task *task) -> bool;
auto check_item_deps(struct rspamd_task *task, symcache &cache, cache_item *item,
@@ -180,7 +180,7 @@ public:
* @param stage
* @return
*/
- auto process_symbols(struct rspamd_task *task, symcache &cache, int stage) -> bool;
+ auto process_symbols(struct rspamd_task *task, symcache &cache, unsigned int stage) -> bool;
/**
* Finalize execution of some item in the cache
diff --git a/src/libserver/task.c b/src/libserver/task.c
index 937dd8b05..9763d1eb4 100644
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -1662,7 +1662,7 @@ rspamd_task_get_required_score(struct rspamd_task *task, struct rspamd_scan_resu
}
}
- for (guint i = m->nactions - 1; i >= 0; i--) {
+ for (guint i = m->nactions; i-- > 0;) {
struct rspamd_action_config *action_lim = &m->actions_config[i];