Cosmetics: fix some cppcheck complains to please QA

This commit is contained in:
Felipe Zimmerle
2020-04-29 10:19:49 -03:00
parent 310cbf899b
commit 9b40a045bb
26 changed files with 244 additions and 77 deletions

View File

@@ -56,8 +56,12 @@ void GeoLookup::cleanUp() {
bool GeoLookup::setDataBase(const std::string& filePath,
std::string *err) {
#ifdef WITH_MAXMIND
std::string intMax;
#endif
#ifdef WITH_GEOIP
std::string intGeo;
#endif
#ifdef WITH_MAXMIND
int status = MMDB_open(filePath.c_str(), MMDB_MODE_MMAP, &mmdb);
@@ -85,19 +89,22 @@ bool GeoLookup::setDataBase(const std::string& filePath,
#ifdef WITH_MAXMIND
err->append(" libMaxMind");
#endif
#ifdef WITH_GEOIP
err->append(" GeoIP");
#endif
err->append(".");
#ifdef WITH_MAXMIND
if (!intMax.empty()) {
err->append(" " + intMax);
}
#endif
#ifdef WITH_GEOIP
if (!intGeo.empty()) {
err->append(" " + intGeo);
}
#endif
return false;
}

View File

@@ -290,7 +290,7 @@ TreeNode *CPTAddElement(unsigned char *ipdata, unsigned int ip_bitmask, CPTTree
unsigned char *buffer = NULL;
unsigned char bitlen = 0;
int bit_validation = 0, test_bit = 0;
int i = 0;
size_t i = 0;
unsigned int x, y;
TreeNode *node = NULL, *new_node = NULL;
TreeNode *parent = NULL, *i_node = NULL;

View File

@@ -81,7 +81,7 @@ class SharedFiles {
{
#ifdef MODSEC_USE_GENERAL_LOCK
int shm_id;
bool toBeCreated;
bool toBeCreated(false);
bool err = false;
m_memKeyStructure = ftok(".", 1);