Skip to content

Commit 68ef2de

Browse files
zimmerlezimmerle
committed
Cosmetics: address cppcheck warnings on src/variables
1 parent ff9152e commit 68ef2de

23 files changed

+58
-57
lines changed

‎src/variables/duration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace variables {
3030

3131
class Duration : public Variable {
3232
public:
33-
explicit Duration(std::string _name)
33+
explicit Duration(const std::string &_name)
3434
: Variable(_name),
3535
m_retName("DURATION") { }
3636

‎src/variables/env.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace variables {
3030

3131
class Env : public Variable {
3232
public:
33-
explicit Env(std::string _name)
33+
explicit Env(const std::string &_name)
3434
: Variable(_name) { }
3535

3636
void evaluate(Transaction *transaction,

‎src/variables/global.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace variables {
3434

3535
class Global_DictElement : public Variable {
3636
public:
37-
explicit Global_DictElement(std::string dictElement)
37+
explicit Global_DictElement(const std::string &dictElement)
3838
: Variable("GLOBAL:" + dictElement),
3939
m_dictElement("GLOBAL:" + dictElement) { }
4040

@@ -67,7 +67,7 @@ class Global_NoDictElement : public Variable {
6767

6868
class Global_DictElementRegexp : public VariableRegex {
6969
public:
70-
explicit Global_DictElementRegexp(std::string dictElement)
70+
explicit Global_DictElementRegexp(const std::string &dictElement)
7171
: VariableRegex("GLOBAL", dictElement),
7272
m_dictElement(dictElement) { }
7373

@@ -100,13 +100,13 @@ class Global_DynamicElement : public Variable {
100100
t->m_rules->m_secWebAppId.m_value, l, m_keyExclusion);
101101
}
102102

103-
void del(Transaction *t, std::string k) {
103+
static void del(Transaction *t, const std::string &k) {
104104
t->m_collections.m_global_collection->del(k,
105105
t->m_collections.m_global_collection_key,
106106
t->m_rules->m_secWebAppId.m_value);
107107
}
108108

109-
void storeOrUpdateFirst(Transaction *t, std::string var,
109+
static void storeOrUpdateFirst(Transaction *t, std::string var,
110110
std::string value) {
111111
t->m_collections.m_global_collection->storeOrUpdateFirst(
112112
var, t->m_collections.m_global_collection_key,

‎src/variables/highest_severity.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace variables {
3030

3131
class HighestSeverity : public Variable {
3232
public:
33-
explicit HighestSeverity(std::string _name)
33+
explicit HighestSeverity(const std::string &_name)
3434
: Variable(_name)
3535
{ }
3636

‎src/variables/ip.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace variables {
3434

3535
class Ip_DictElement : public Variable {
3636
public:
37-
explicit Ip_DictElement(std::string dictElement)
37+
explicit Ip_DictElement(const std::string &dictElement)
3838
: Variable("IP:" + dictElement),
3939
m_dictElement("IP:" + dictElement) { }
4040

@@ -67,7 +67,7 @@ class Ip_NoDictElement : public Variable {
6767

6868
class Ip_DictElementRegexp : public VariableRegex {
6969
public:
70-
explicit Ip_DictElementRegexp(std::string dictElement)
70+
explicit Ip_DictElementRegexp(const std::string &dictElement)
7171
: VariableRegex("IP", dictElement),
7272
m_dictElement(dictElement) { }
7373

@@ -99,14 +99,14 @@ class Ip_DynamicElement : public Variable {
9999
t->m_rules->m_secWebAppId.m_value, l, m_keyExclusion);
100100
}
101101

102-
void del(Transaction *t, std::string k) {
102+
static void del(Transaction *t, const std::string &k) {
103103
t->m_collections.m_ip_collection->del(k,
104104
t->m_collections.m_ip_collection_key,
105105
t->m_rules->m_secWebAppId.m_value);
106106
}
107107

108-
void storeOrUpdateFirst(Transaction *t, std::string var,
109-
std::string value) {
108+
static void storeOrUpdateFirst(Transaction *t, const std::string &var,
109+
const std::string &value) {
110110
t->m_collections.m_ip_collection->storeOrUpdateFirst(
111111
var, t->m_collections.m_ip_collection_key,
112112
t->m_rules->m_secWebAppId.m_value,

‎src/variables/modsec_build.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace variables {
3232

3333
class ModsecBuild : public Variable {
3434
public:
35-
explicit ModsecBuild(std::string _name)
35+
explicit ModsecBuild(const std::string &_name)
3636
: Variable(_name),
3737
m_retName("MODSEC_BUILD") {
3838
std::ostringstream ss;

‎src/variables/remote_user.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace variables {
3232

3333
class RemoteUser : public Variable {
3434
public:
35-
explicit RemoteUser(std::string _name)
35+
explicit RemoteUser(const std::string &_name)
3636
: Variable(_name),
3737
m_retName("REMOTE_USER") { }
3838

‎src/variables/resource.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace variables {
3434

3535
class Resource_DictElement : public Variable {
3636
public:
37-
explicit Resource_DictElement(std::string dictElement)
37+
explicit Resource_DictElement(const std::string &dictElement)
3838
: Variable("RESOURCE:" + dictElement),
3939
m_dictElement("RESOURCE:" + dictElement) { }
4040

@@ -67,7 +67,7 @@ class Resource_NoDictElement : public Variable {
6767

6868
class Resource_DictElementRegexp : public VariableRegex {
6969
public:
70-
explicit Resource_DictElementRegexp(std::string dictElement)
70+
explicit Resource_DictElementRegexp(const std::string &dictElement)
7171
: VariableRegex("RESOURCE:", dictElement),
7272
m_dictElement(dictElement) { }
7373

@@ -99,14 +99,14 @@ class Resource_DynamicElement : public Variable {
9999
t->m_rules->m_secWebAppId.m_value, l, m_keyExclusion);
100100
}
101101

102-
void del(Transaction *t, std::string k) {
102+
static void del(Transaction *t, const std::string &k) {
103103
t->m_collections.m_resource_collection->del(k,
104104
t->m_collections.m_resource_collection_key,
105105
t->m_rules->m_secWebAppId.m_value);
106106
}
107107

108-
void storeOrUpdateFirst(Transaction *t, std::string var,
109-
std::string value) {
108+
static void storeOrUpdateFirst(Transaction *t, const std::string &var,
109+
const std::string &value) {
110110
t->m_collections.m_resource_collection->storeOrUpdateFirst(
111111
var, t->m_collections.m_resource_collection_key,
112112
t->m_rules->m_secWebAppId.m_value, value);

‎src/variables/rule.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace variables {
3434

3535
class Rule_DictElement : public VariableDictElement { \
3636
public:
37-
explicit Rule_DictElement(std::string dictElement)
37+
explicit Rule_DictElement(const std::string &dictElement)
3838
: VariableDictElement(std::string("RULE"), dictElement) { }
3939

4040
static void id(Transaction *t,
@@ -194,7 +194,7 @@ class Rule_DictElement : public VariableDictElement { \
194194

195195
class Rule_DictElementRegexp : public VariableRegex {
196196
public:
197-
explicit Rule_DictElementRegexp(std::string regex)
197+
explicit Rule_DictElementRegexp(const std::string &regex)
198198
: VariableRegex("RULE", regex) { }
199199

200200
void evaluate(Transaction *t,

‎src/variables/session.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace variables {
3434

3535
class Session_DictElement : public Variable {
3636
public:
37-
explicit Session_DictElement(std::string dictElement)
37+
explicit Session_DictElement(const std::string &dictElement)
3838
: Variable("SESSION:" + dictElement),
3939
m_dictElement("SESSION:" + dictElement) { }
4040

@@ -67,7 +67,7 @@ class Session_NoDictElement : public Variable {
6767

6868
class Session_DictElementRegexp : public VariableRegex {
6969
public:
70-
explicit Session_DictElementRegexp(std::string dictElement)
70+
explicit Session_DictElementRegexp(const std::string &dictElement)
7171
: VariableRegex("SESSION", dictElement),
7272
m_dictElement(dictElement) { }
7373

@@ -99,14 +99,14 @@ class Session_DynamicElement : public Variable {
9999
t->m_rules->m_secWebAppId.m_value, l, m_keyExclusion);
100100
}
101101

102-
void del(Transaction *t, std::string k) {
102+
static void del(Transaction *t, const std::string &k) {
103103
t->m_collections.m_session_collection->del(k,
104104
t->m_collections.m_session_collection_key,
105105
t->m_collections.m_ip_collection_key);
106106
}
107107

108-
void storeOrUpdateFirst(Transaction *t, std::string var,
109-
std::string value) {
108+
static void storeOrUpdateFirst(Transaction *t, const std::string &var,
109+
const std::string &value) {
110110
t->m_collections.m_session_collection->storeOrUpdateFirst(
111111
var, t->m_collections.m_session_collection_key,
112112
t->m_rules->m_secWebAppId.m_value,

‎src/variables/time.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace variables {
3131

3232
class Time : public Variable {
3333
public:
34-
explicit Time(std::string _name)
34+
explicit Time(const std::string &_name)
3535
: Variable(_name),
3636
m_retName("TIME") { }
3737

‎src/variables/time_day.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace variables {
3030

3131
class TimeDay : public Variable {
3232
public:
33-
explicit TimeDay(std::string _name)
33+
explicit TimeDay(const std::string &_name)
3434
: Variable(_name),
3535
m_retName("TIME_DAY") { }
3636

‎src/variables/time_epoch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace variables {
3030

3131
class TimeEpoch : public Variable {
3232
public:
33-
explicit TimeEpoch(std::string _name)
33+
explicit TimeEpoch(const std::string &_name)
3434
: Variable(_name),
3535
m_retName("TIME_EPOCH") { }
3636

‎src/variables/time_hour.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace variables {
3030

3131
class TimeHour : public Variable {
3232
public:
33-
explicit TimeHour(std::string _name)
33+
explicit TimeHour(const std::string &_name)
3434
: Variable(_name),
3535
m_retName("TIME_HOUR") { }
3636

‎src/variables/time_min.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace variables {
3030

3131
class TimeMin : public Variable {
3232
public:
33-
explicit TimeMin(std::string _name)
33+
explicit TimeMin(const std::string &_name)
3434
: Variable(_name),
3535
m_retName("TIME_MIN") { }
3636

‎src/variables/time_mon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace variables {
3030

3131
class TimeMon : public Variable {
3232
public:
33-
explicit TimeMon(std::string _name)
33+
explicit TimeMon(const std::string &_name)
3434
: Variable(_name),
3535
m_retName("TIME_MON") { }
3636

‎src/variables/time_sec.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace variables {
3030

3131
class TimeSec : public Variable {
3232
public:
33-
explicit TimeSec(std::string _name)
33+
explicit TimeSec(const std::string &_name)
3434
: Variable(_name),
3535
m_retName("TIME_SEC") { }
3636

‎src/variables/time_wday.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace variables {
3030

3131
class TimeWDay : public Variable {
3232
public:
33-
explicit TimeWDay(std::string _name)
33+
explicit TimeWDay(const std::string &_name)
3434
: Variable(_name),
3535
m_retName("TIME_WDAY") { }
3636

‎src/variables/time_year.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace variables {
3030

3131
class TimeYear : public Variable {
3232
public:
33-
explicit TimeYear(std::string _name)
33+
explicit TimeYear(const std::string &_name)
3434
: Variable(_name),
3535
m_retName("TIME_YEAR") { }
3636

‎src/variables/tx.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace variables {
3434

3535
class Tx_DictElement : public Variable {
3636
public:
37-
explicit Tx_DictElement(std::string dictElement)
37+
explicit Tx_DictElement(const std::string &dictElement)
3838
: Variable("TX:" + dictElement),
3939
m_dictElement("TX:" + dictElement) { }
4040

@@ -65,7 +65,7 @@ class Tx_NoDictElement : public Variable {
6565

6666
class Tx_DictElementRegexp : public VariableRegex {
6767
public:
68-
explicit Tx_DictElementRegexp(std::string dictElement)
68+
explicit Tx_DictElementRegexp(const std::string &dictElement)
6969
: VariableRegex("TX", dictElement),
7070
m_dictElement(dictElement) { }
7171

@@ -94,11 +94,11 @@ class Tx_DynamicElement : public Variable {
9494
m_keyExclusion);
9595
}
9696

97-
void del(Transaction *t, std::string k) {
97+
static void del(Transaction *t, const std::string &k) {
9898
t->m_collections.m_tx_collection->del(k);
9999
}
100100

101-
void storeOrUpdateFirst(Transaction *t, std::string var,
101+
static void storeOrUpdateFirst(Transaction *t, const std::string &var,
102102
std::string value) {
103103
t->m_collections.m_tx_collection->storeOrUpdateFirst(var, value);
104104
}

‎src/variables/user.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace variables {
3434

3535
class User_DictElement : public Variable {
3636
public:
37-
explicit User_DictElement(std::string dictElement)
37+
explicit User_DictElement(const std::string &dictElement)
3838
: Variable("USER:" + dictElement),
3939
m_dictElement("USER:" + dictElement) { }
4040

@@ -67,7 +67,7 @@ class User_NoDictElement : public Variable {
6767

6868
class User_DictElementRegexp : public VariableRegex {
6969
public:
70-
explicit User_DictElementRegexp(std::string dictElement)
70+
explicit User_DictElementRegexp(const std::string &dictElement)
7171
: VariableRegex("USER", dictElement),
7272
m_dictElement(dictElement) { }
7373

@@ -99,14 +99,14 @@ class User_DynamicElement : public Variable {
9999
t->m_rules->m_secWebAppId.m_value, l, m_keyExclusion);
100100
}
101101

102-
void del(Transaction *t, std::string k) {
102+
static void del(Transaction *t, const std::string &k) {
103103
t->m_collections.m_user_collection->del(k,
104104
t->m_collections.m_user_collection_key,
105105
t->m_rules->m_secWebAppId.m_value);
106106
}
107107

108-
void storeOrUpdateFirst(Transaction *t, std::string var,
109-
std::string value) {
108+
static void storeOrUpdateFirst(Transaction *t, const std::string &var,
109+
const std::string &value) {
110110
t->m_collections.m_user_collection->storeOrUpdateFirst(
111111
var, t->m_collections.m_user_collection_key,
112112
t->m_rules->m_secWebAppId.m_value,

0 commit comments

Comments
 (0)