From 4b03e89b01c9a27c1856bf4ffcfca117aa2f159f Mon Sep 17 00:00:00 2001
From: Felipe Zimmerle <felipe@zimmerle.org>
Date: Wed, 20 Mar 2019 16:21:28 -0300
Subject: [PATCH] Cosmetics: Defining a type for RuleId

---
 headers/modsecurity/modsecurity.h | 2 ++
 headers/modsecurity/rules.h       | 4 ++--
 src/rule_with_actions.h           | 4 ++--
 src/rules.cc                      | 4 ++--
 test/cppcheck_suppressions.txt    | 2 ++
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/headers/modsecurity/modsecurity.h b/headers/modsecurity/modsecurity.h
index 8f51ec6b..15302c38 100644
--- a/headers/modsecurity/modsecurity.h
+++ b/headers/modsecurity/modsecurity.h
@@ -95,6 +95,8 @@ namespace modsecurity {
      */
     using ModSecString = std::string;
 
+    using RuleId = int64_t;
+
     /**
      *
      * The Phases enumerator consists in mapping the different stages of a
diff --git a/headers/modsecurity/rules.h b/headers/modsecurity/rules.h
index 209356b5..0f0f8898 100644
--- a/headers/modsecurity/rules.h
+++ b/headers/modsecurity/rules.h
@@ -45,13 +45,13 @@ class Rules {
     void dump() const;
 
     int append(Rules *from,
-        const std::vector<int64_t> &ids,
+        const std::vector<RuleId> &ids,
         std::ostringstream *err);
 
     bool insert(const std::shared_ptr<Rule> &rule);
 
     bool insert(std::shared_ptr<Rule> rule,
-        const std::vector<int64_t> *ids,
+        const std::vector<RuleId> *ids,
         std::ostringstream *err);
 
     size_t size() const;
diff --git a/src/rule_with_actions.h b/src/rule_with_actions.h
index f410a7b4..315540e8 100644
--- a/src/rule_with_actions.h
+++ b/src/rule_with_actions.h
@@ -408,7 +408,7 @@ class RuleWithActions : public Rule {
         return dst;
     }
 
-    inline int64_t getId() const { return m_ruleId; }
+    inline RuleId getId() const { return m_ruleId; }
     void setId(int id) {
         m_ruleId = id;
     }
@@ -443,7 +443,7 @@ class RuleWithActions : public Rule {
     }
 
  private:
-    int64_t m_ruleId;
+    RuleId m_ruleId;
 
     std::shared_ptr<RuleWithActions> m_chainedRuleChild;
     RuleWithActions *m_chainedRuleParent;
diff --git a/src/rules.cc b/src/rules.cc
index e2a70c65..44f98106 100644
--- a/src/rules.cc
+++ b/src/rules.cc
@@ -20,7 +20,7 @@
 namespace modsecurity {
 
 
-int Rules::append(Rules *from, const std::vector<int64_t> &ids, std::ostringstream *err) {
+int Rules::append(Rules *from, const std::vector<RuleId> &ids, std::ostringstream *err) {
     size_t j = 0;
     for (; j < from->size(); j++) {
         RuleWithActions *rule = dynamic_cast<RuleWithActions*>(from->at(j).get());
@@ -42,7 +42,7 @@ bool Rules::insert(const std::shared_ptr<Rule> &rule) {
 }
 
 
-bool Rules::insert(std::shared_ptr<Rule> rule, const std::vector<int64_t> *ids, std::ostringstream *err) {
+bool Rules::insert(std::shared_ptr<Rule> rule, const std::vector<RuleId> *ids, std::ostringstream *err) {
     RuleWithActions*r = dynamic_cast<RuleWithActions*>(rule.get());
     if (r && ids != nullptr
         && std::binary_search(ids->begin(), ids->end(), r->getId())) {
diff --git a/test/cppcheck_suppressions.txt b/test/cppcheck_suppressions.txt
index a8b8abc2..fde3545a 100644
--- a/test/cppcheck_suppressions.txt
+++ b/test/cppcheck_suppressions.txt
@@ -56,6 +56,8 @@ duplicateBranch:src/request_body_processor/multipart.cc:93
 danglingTempReference:src/modsecurity.cc:206
 knownConditionTrueFalse:src/operators/validate_url_encoding.cc:77
 knownConditionTrueFalse:src/operators/verify_svnr.cc:88
+noConstructor:src/actions/rule_id.h:33
+functionStatic:src/actions/rule_id.h:35
 
 noExplicitConstructor:seclang-parser.hh
 constParameter:seclang-parser.hh