Cosmetics: address cppcheck warnings on src/variables

zimmerle · zimmerle · commit 68ef2dece368 · 2020-01-27T09:08:31.000-03:00
diff --git a/src/variables/duration.h b/src/variables/duration.h
@@ -30,7 +30,7 @@ namespace variables {
 
 class Duration : public Variable {
  public:
-    explicit Duration(std::string _name)
+    explicit Duration(const std::string &_name)
         : Variable(_name),
         m_retName("DURATION") { }
 
diff --git a/src/variables/env.h b/src/variables/env.h
@@ -30,7 +30,7 @@ namespace variables {
 
 class Env : public Variable {
  public:
-    explicit Env(std::string _name)
+    explicit Env(const std::string &_name)
         : Variable(_name) { }
 
     void evaluate(Transaction *transaction,
diff --git a/src/variables/global.h b/src/variables/global.h
@@ -34,7 +34,7 @@ namespace variables {
 
 class Global_DictElement : public Variable {
  public:
-    explicit Global_DictElement(std::string dictElement)
+    explicit Global_DictElement(const std::string &dictElement)
         : Variable("GLOBAL:" + dictElement),
         m_dictElement("GLOBAL:" + dictElement) { }
 
@@ -67,7 +67,7 @@ class Global_NoDictElement : public Variable {
 
 class Global_DictElementRegexp : public VariableRegex {
  public:
-    explicit Global_DictElementRegexp(std::string dictElement)
+    explicit Global_DictElementRegexp(const std::string &dictElement)
         : VariableRegex("GLOBAL", dictElement),
         m_dictElement(dictElement) { }
 
@@ -100,13 +100,13 @@ class Global_DynamicElement : public Variable {
             t->m_rules->m_secWebAppId.m_value, l, m_keyExclusion);
     }
 
-    void del(Transaction *t, std::string k) {
+    static void del(Transaction *t, const std::string &k) {
         t->m_collections.m_global_collection->del(k,
             t->m_collections.m_global_collection_key,
             t->m_rules->m_secWebAppId.m_value);
     }
 
-    void storeOrUpdateFirst(Transaction *t, std::string var,
+    static void storeOrUpdateFirst(Transaction *t, std::string var,
         std::string value) {
         t->m_collections.m_global_collection->storeOrUpdateFirst(
             var, t->m_collections.m_global_collection_key,
diff --git a/src/variables/highest_severity.h b/src/variables/highest_severity.h
@@ -30,7 +30,7 @@ namespace variables {
 
 class HighestSeverity : public Variable {
  public:
-    explicit HighestSeverity(std::string _name)
+    explicit HighestSeverity(const std::string &_name)
         : Variable(_name)
     { }
 
diff --git a/src/variables/ip.h b/src/variables/ip.h
@@ -34,7 +34,7 @@ namespace variables {
 
 class Ip_DictElement : public Variable {
  public:
-    explicit Ip_DictElement(std::string dictElement)
+    explicit Ip_DictElement(const std::string &dictElement)
         : Variable("IP:" + dictElement),
         m_dictElement("IP:" + dictElement) { }
 
@@ -67,7 +67,7 @@ class Ip_NoDictElement : public Variable {
 
 class Ip_DictElementRegexp : public VariableRegex {
  public:
-    explicit Ip_DictElementRegexp(std::string dictElement)
+    explicit Ip_DictElementRegexp(const std::string &dictElement)
         : VariableRegex("IP", dictElement),
         m_dictElement(dictElement) { }
 
@@ -99,14 +99,14 @@ class Ip_DynamicElement : public Variable {
             t->m_rules->m_secWebAppId.m_value, l, m_keyExclusion);
     }
 
-    void del(Transaction *t, std::string k) {
+    static void del(Transaction *t, const std::string &k) {
         t->m_collections.m_ip_collection->del(k,
             t->m_collections.m_ip_collection_key,
             t->m_rules->m_secWebAppId.m_value);
     }
 
-    void storeOrUpdateFirst(Transaction *t, std::string var,
-        std::string value) {
+    static void storeOrUpdateFirst(Transaction *t, const std::string &var,
+        const std::string &value) {
         t->m_collections.m_ip_collection->storeOrUpdateFirst(
             var, t->m_collections.m_ip_collection_key,
             t->m_rules->m_secWebAppId.m_value,
diff --git a/src/variables/modsec_build.h b/src/variables/modsec_build.h
@@ -32,7 +32,7 @@ namespace variables {
 
 class ModsecBuild : public Variable {
  public:
-    explicit ModsecBuild(std::string _name)
+    explicit ModsecBuild(const std::string &_name)
         : Variable(_name),
         m_retName("MODSEC_BUILD") {
         std::ostringstream ss;
diff --git a/src/variables/remote_user.h b/src/variables/remote_user.h
@@ -32,7 +32,7 @@ namespace variables {
 
 class RemoteUser : public Variable {
  public:
-    explicit RemoteUser(std::string _name)
+    explicit RemoteUser(const std::string &_name)
         : Variable(_name),
         m_retName("REMOTE_USER") { }
 
diff --git a/src/variables/resource.h b/src/variables/resource.h
@@ -34,7 +34,7 @@ namespace variables {
 
 class Resource_DictElement : public Variable {
  public:
-    explicit Resource_DictElement(std::string dictElement)
+    explicit Resource_DictElement(const std::string &dictElement)
         : Variable("RESOURCE:" + dictElement),
         m_dictElement("RESOURCE:" + dictElement) { }
 
@@ -67,7 +67,7 @@ class Resource_NoDictElement : public Variable {
 
 class Resource_DictElementRegexp : public VariableRegex {
  public:
-    explicit Resource_DictElementRegexp(std::string dictElement)
+    explicit Resource_DictElementRegexp(const std::string &dictElement)
         : VariableRegex("RESOURCE:", dictElement),
         m_dictElement(dictElement) { }
 
@@ -99,14 +99,14 @@ class Resource_DynamicElement : public Variable {
             t->m_rules->m_secWebAppId.m_value, l, m_keyExclusion);
     }
 
-    void del(Transaction *t, std::string k) {
+    static void del(Transaction *t, const std::string &k) {
         t->m_collections.m_resource_collection->del(k,
             t->m_collections.m_resource_collection_key,
             t->m_rules->m_secWebAppId.m_value);
     }
 
-    void storeOrUpdateFirst(Transaction *t, std::string var,
-        std::string value) {
+    static void storeOrUpdateFirst(Transaction *t, const std::string &var,
+        const std::string &value) {
         t->m_collections.m_resource_collection->storeOrUpdateFirst(
             var, t->m_collections.m_resource_collection_key,
             t->m_rules->m_secWebAppId.m_value, value);
diff --git a/src/variables/rule.h b/src/variables/rule.h
@@ -34,7 +34,7 @@ namespace variables {
 
 class Rule_DictElement : public VariableDictElement { \
  public:
-    explicit Rule_DictElement(std::string dictElement)
+    explicit Rule_DictElement(const std::string &dictElement)
         : VariableDictElement(std::string("RULE"), dictElement) { }
 
     static void id(Transaction *t,
@@ -194,7 +194,7 @@ class Rule_DictElement : public VariableDictElement { \
 
 class Rule_DictElementRegexp : public VariableRegex {
  public:
-    explicit Rule_DictElementRegexp(std::string regex)
+    explicit Rule_DictElementRegexp(const std::string &regex)
         : VariableRegex("RULE", regex) { }
 
     void evaluate(Transaction *t,
diff --git a/src/variables/session.h b/src/variables/session.h
@@ -34,7 +34,7 @@ namespace variables {
 
 class Session_DictElement : public Variable {
  public:
-    explicit Session_DictElement(std::string dictElement)
+    explicit Session_DictElement(const std::string &dictElement)
         : Variable("SESSION:" + dictElement),
         m_dictElement("SESSION:" + dictElement) { }
 
@@ -67,7 +67,7 @@ class Session_NoDictElement : public Variable {
 
 class Session_DictElementRegexp : public VariableRegex {
  public:
-    explicit Session_DictElementRegexp(std::string dictElement)
+    explicit Session_DictElementRegexp(const std::string &dictElement)
         : VariableRegex("SESSION", dictElement),
         m_dictElement(dictElement) { }
 
@@ -99,14 +99,14 @@ class Session_DynamicElement : public Variable {
             t->m_rules->m_secWebAppId.m_value, l, m_keyExclusion);
     }
 
-    void del(Transaction *t, std::string k) {
+    static void del(Transaction *t, const std::string &k) {
         t->m_collections.m_session_collection->del(k,
             t->m_collections.m_session_collection_key,
             t->m_collections.m_ip_collection_key);
     }
 
-    void storeOrUpdateFirst(Transaction *t, std::string var,
-        std::string value) {
+    static void storeOrUpdateFirst(Transaction *t, const std::string &var,
+        const std::string &value) {
         t->m_collections.m_session_collection->storeOrUpdateFirst(
             var, t->m_collections.m_session_collection_key,
             t->m_rules->m_secWebAppId.m_value,
diff --git a/src/variables/time.h b/src/variables/time.h
@@ -31,7 +31,7 @@ namespace variables {
 
 class Time : public Variable {
  public:
-    explicit Time(std::string _name)
+    explicit Time(const std::string &_name)
         : Variable(_name),
         m_retName("TIME") { }
 
diff --git a/src/variables/time_day.h b/src/variables/time_day.h
@@ -30,7 +30,7 @@ namespace variables {
 
 class TimeDay : public Variable {
  public:
-    explicit TimeDay(std::string _name)
+    explicit TimeDay(const std::string &_name)
         : Variable(_name),
         m_retName("TIME_DAY") { }
 
diff --git a/src/variables/time_epoch.h b/src/variables/time_epoch.h
@@ -30,7 +30,7 @@ namespace variables {
 
 class TimeEpoch : public Variable {
  public:
-    explicit TimeEpoch(std::string _name)
+    explicit TimeEpoch(const std::string &_name)
         : Variable(_name),
         m_retName("TIME_EPOCH") { }
 
diff --git a/src/variables/time_hour.h b/src/variables/time_hour.h
@@ -30,7 +30,7 @@ namespace variables {
 
 class TimeHour : public Variable {
  public:
-    explicit TimeHour(std::string _name)
+    explicit TimeHour(const std::string &_name)
         : Variable(_name),
         m_retName("TIME_HOUR") { }
 
diff --git a/src/variables/time_min.h b/src/variables/time_min.h
@@ -30,7 +30,7 @@ namespace variables {
 
 class TimeMin : public Variable {
  public:
-    explicit TimeMin(std::string _name)
+    explicit TimeMin(const std::string &_name)
         : Variable(_name),
         m_retName("TIME_MIN") { }
 
diff --git a/src/variables/time_mon.h b/src/variables/time_mon.h
@@ -30,7 +30,7 @@ namespace variables {
 
 class TimeMon : public Variable {
  public:
-    explicit TimeMon(std::string _name)
+    explicit TimeMon(const std::string &_name)
         : Variable(_name),
         m_retName("TIME_MON") { }
 
diff --git a/src/variables/time_sec.h b/src/variables/time_sec.h
@@ -30,7 +30,7 @@ namespace variables {
 
 class TimeSec : public Variable {
  public:
-    explicit TimeSec(std::string _name)
+    explicit TimeSec(const std::string &_name)
         : Variable(_name),
         m_retName("TIME_SEC") { }
 
diff --git a/src/variables/time_wday.h b/src/variables/time_wday.h
@@ -30,7 +30,7 @@ namespace variables {
 
 class TimeWDay : public Variable {
  public:
-    explicit TimeWDay(std::string _name)
+    explicit TimeWDay(const std::string &_name)
         : Variable(_name),
         m_retName("TIME_WDAY") { }
 
diff --git a/src/variables/time_year.h b/src/variables/time_year.h
@@ -30,7 +30,7 @@ namespace variables {
 
 class TimeYear : public Variable {
  public:
-    explicit TimeYear(std::string _name)
+    explicit TimeYear(const std::string &_name)
         : Variable(_name),
         m_retName("TIME_YEAR") { }
 
diff --git a/src/variables/tx.h b/src/variables/tx.h
@@ -34,7 +34,7 @@ namespace variables {
 
 class Tx_DictElement : public Variable {
  public:
-    explicit Tx_DictElement(std::string dictElement)
+    explicit Tx_DictElement(const std::string &dictElement)
         : Variable("TX:" + dictElement),
         m_dictElement("TX:" + dictElement) { }
 
@@ -65,7 +65,7 @@ class Tx_NoDictElement : public Variable {
 
 class Tx_DictElementRegexp : public VariableRegex {
  public:
-    explicit Tx_DictElementRegexp(std::string dictElement)
+    explicit Tx_DictElementRegexp(const std::string &dictElement)
         : VariableRegex("TX", dictElement),
         m_dictElement(dictElement) { }
 
@@ -94,11 +94,11 @@ class Tx_DynamicElement : public Variable {
             m_keyExclusion);
     }
 
-    void del(Transaction *t, std::string k) {
+    static void del(Transaction *t, const std::string &k) {
         t->m_collections.m_tx_collection->del(k);
     }
 
-    void storeOrUpdateFirst(Transaction *t, std::string var,
+    static void storeOrUpdateFirst(Transaction *t, const std::string &var,
         std::string value) {
         t->m_collections.m_tx_collection->storeOrUpdateFirst(var, value);
     }
diff --git a/src/variables/user.h b/src/variables/user.h
@@ -34,7 +34,7 @@ namespace variables {
 
 class User_DictElement : public Variable {
  public:
-    explicit User_DictElement(std::string dictElement)
+    explicit User_DictElement(const std::string &dictElement)
         : Variable("USER:" + dictElement),
         m_dictElement("USER:" + dictElement) { }
 
@@ -67,7 +67,7 @@ class User_NoDictElement : public Variable {
 
 class User_DictElementRegexp : public VariableRegex {
  public:
-    explicit User_DictElementRegexp(std::string dictElement)
+    explicit User_DictElementRegexp(const std::string &dictElement)
         : VariableRegex("USER", dictElement),
         m_dictElement(dictElement) { }
 
@@ -99,14 +99,14 @@ class User_DynamicElement : public Variable {
             t->m_rules->m_secWebAppId.m_value, l, m_keyExclusion);
     }
 
-    void del(Transaction *t, std::string k) {
+    static void del(Transaction *t, const std::string &k) {
         t->m_collections.m_user_collection->del(k,
             t->m_collections.m_user_collection_key,
             t->m_rules->m_secWebAppId.m_value);
     }
 
-    void storeOrUpdateFirst(Transaction *t, std::string var,
-        std::string value) {
+    static void storeOrUpdateFirst(Transaction *t, const std::string &var,
+        const std::string &value) {
         t->m_collections.m_user_collection->storeOrUpdateFirst(
             var, t->m_collections.m_user_collection_key,
             t->m_rules->m_secWebAppId.m_value,
diff --git a/src/variables/variable.h b/src/variables/variable.h
diff --git a/src/variables/xml.h b/src/variables/xml.h
