mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-09-30 03:34:29 +03:00
Minor codebase improvements suggested by Sonarcloud
- src/modsecurity.cc - Replace the redundant type with "auto". - src/transaction.cc - Avoid this unnecessary copy by using a "const" reference. - test/common/custom_debug_log.cc - Use "=default" instead of the default implementation of this special member functions. - Removed the unnecessary destructor override instead. - Annotate this function with "override" or "final". - Removed the unnecessary destructor override instead. - Remove this "const" qualifier from the return type in all declarations. - test/common/modsecurity_test_context.h - Replace the redundant type with "auto". - test/regression/regression.cc - Use the "nullptr" literal. - Replace this declaration by a structured binding declaration. - Replace "reinterpret_cast" with a safer operation.
This commit is contained in:
@@ -97,15 +97,15 @@ void actions(ModSecurityTestResults<RegressionTest> *r,
|
||||
if (it.status != 0) {
|
||||
r->status = it.status;
|
||||
}
|
||||
if (it.url != NULL) {
|
||||
if (it.url != nullptr) {
|
||||
r->location.append(it.url);
|
||||
free(it.url);
|
||||
it.url = NULL;
|
||||
it.url = nullptr;
|
||||
}
|
||||
if (it.log != NULL) {
|
||||
if (it.log != nullptr) {
|
||||
*serverLog << it.log;
|
||||
free(it.log);
|
||||
it.log = NULL;
|
||||
it.log = nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -283,9 +283,9 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
|
||||
|
||||
actions(&r, &modsec_transaction, &context.m_server_log);
|
||||
|
||||
for (const auto &headers : t->request_headers) {
|
||||
modsec_transaction.addRequestHeader(headers.first.c_str(),
|
||||
headers.second.c_str());
|
||||
for (const auto &[name, value] : t->request_headers) {
|
||||
modsec_transaction.addRequestHeader(name.c_str(),
|
||||
value.c_str());
|
||||
}
|
||||
|
||||
modsec_transaction.processRequestHeaders();
|
||||
@@ -297,9 +297,9 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
|
||||
modsec_transaction.processRequestBody();
|
||||
actions(&r, &modsec_transaction, &context.m_server_log);
|
||||
|
||||
for (const auto &headers : t->response_headers) {
|
||||
modsec_transaction.addResponseHeader(headers.first.c_str(),
|
||||
headers.second.c_str());
|
||||
for (const auto &[name, value] : t->response_headers) {
|
||||
modsec_transaction.addResponseHeader(name.c_str(),
|
||||
value.c_str());
|
||||
}
|
||||
|
||||
modsec_transaction.processResponseHeaders(r.status,
|
||||
@@ -314,7 +314,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
|
||||
|
||||
modsec_transaction.processLogging();
|
||||
|
||||
const auto *d = reinterpret_cast<CustomDebugLog *>(context.m_modsec_rules.m_debugLog);
|
||||
const auto *d = static_cast<CustomDebugLog *>(context.m_modsec_rules.m_debugLog);
|
||||
|
||||
if (!d->contains(t->debug_log)) {
|
||||
if (test->m_automake_output) {
|
||||
@@ -455,8 +455,8 @@ int main(int argc, char **argv)
|
||||
int counter = 0;
|
||||
|
||||
std::list<std::string> keyList;
|
||||
for (const auto &a : test) {
|
||||
keyList.push_back(a.first);
|
||||
for (const auto &[name, tests] : test) {
|
||||
keyList.push_back(name);
|
||||
}
|
||||
keyList.sort();
|
||||
|
||||
|
Reference in New Issue
Block a user