Implement sonarcloud suggestions

eduar-hte · Apr 28, 2024 · 5a4cbfb · 5a4cbfb
1 parent 7a679a5
commit 5a4cbfb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h b/examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h
@@ -124,7 +124,7 @@ class ReadingLogsViaRuleMessage {
             m_rules(rules)
         { }
 
-    int process() {
+    int process() const {
         pthread_t threads[NUM_THREADS];
         int i;
         struct data_ms dms;

diff --git a/src/rule_with_operator.cc b/src/rule_with_operator.cc
@@ -133,45 +133,42 @@ bool RuleWithOperator::executeOperatorAt(Transaction *trans, const std::string &
 
 void RuleWithOperator::getVariablesExceptions(Transaction *t,
     variables::Variables *exclusion, variables::Variables *addition) {
-    for (auto &a : t->m_rules->m_exceptions.m_variable_update_target_by_tag) { // cppcheck-suppress ctunullpointer
-        if (containsTag(*a.first.get(), t) == false) {
+    for (const auto &[tag, var] : t->m_rules->m_exceptions.m_variable_update_target_by_tag) { // cppcheck-suppress ctunullpointer
+        if (containsTag(*tag, t) == false) {
             continue;
         }
-        Variable *b = a.second.get();
-        if (dynamic_cast<variables::VariableModificatorExclusion*>(b)) {
+        if (dynamic_cast<variables::VariableModificatorExclusion*>(var)) {
             exclusion->push_back(
                 dynamic_cast<variables::VariableModificatorExclusion*>(
-                    b)->m_base.get());
+                    var)->m_base.get());
         } else {
-            addition->push_back(b);
+            addition->push_back(var);
         }
     }
 
-    for (auto &a : t->m_rules->m_exceptions.m_variable_update_target_by_msg) {
-        if (containsMsg(*a.first.get(), t) == false) {
+    for (const auto &[msg, var] : t->m_rules->m_exceptions.m_variable_update_target_by_msg) {
+        if (containsMsg(*msg, t) == false) {
             continue;
         }
-        Variable *b = a.second.get();
-        if (dynamic_cast<variables::VariableModificatorExclusion*>(b)) {
+        if (dynamic_cast<variables::VariableModificatorExclusion*>(var)) {
             exclusion->push_back(
                 dynamic_cast<variables::VariableModificatorExclusion*>(
-                    b)->m_base.get());
+                    var)->m_base.get());
         } else {
-            addition->push_back(b);
+            addition->push_back(var);
         }
     }
 
-    for (auto &a : t->m_rules->m_exceptions.m_variable_update_target_by_id) {
-        if (m_ruleId != a.first) {
+    for (const auto &[ruleId, var] : t->m_rules->m_exceptions.m_variable_update_target_by_id) {
+        if (m_ruleId != ruleId) {
             continue;
         }
-        Variable *b = a.second.get();
-        if (dynamic_cast<variables::VariableModificatorExclusion*>(b)) {
+        if (dynamic_cast<variables::VariableModificatorExclusion*>(var)) {
             exclusion->push_back(
                 dynamic_cast<variables::VariableModificatorExclusion*>(
-                    b)->m_base.get());
+                    var)->m_base.get());
         } else {
-            addition->push_back(b);
+            addition->push_back(var);
         }
     }
 }