github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix the conflict based on latest v3/master

Browse Source 
Signed-off-by: Le Yao <le.yao@intel.com>
This commit is contained in:
Le Yao 2022-07-25 21:24:49 -04:00
commit d50c17ec87
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/system.cc
View File

@ -65,13 +65,13 @@ std::list<std::string> expandEnv(const std::string& var, int flags) {
return vars; return vars;
} }
bool createDir(std::string dir, int mode, std::string *error) { bool createDir(const std::string& dir, int mode, std::string *error) {
return true; return true;
} }
bool isFile(std::string f) { bool isFile(const std::string& f) {
return true; return true;
} }

4
src/utils/system.h
View File

@ -33,8 +33,8 @@ std::string find_resource(const std::string& file, const std::string& config,
std::string *err); std::string *err);
std::string get_path(const std::string& file); std::string get_path(const std::string& file);
std::list<std::string> expandEnv(const std::string& var, int flags); std::list<std::string> expandEnv(const std::string& var, int flags);
bool createDir(std::string dir, int mode, std::string *error); bool createDir(const std::string& dir, int mode, std::string *error);
bool isFile(std::string f); bool isFile(const std::string& f);
} // namespace utils } // namespace utils
} // namespace modsecurity } // namespace modsecurity

2
test/cppcheck_suppressions.txt
View File

@ -62,8 +62,6 @@ ctunullpointer:src/rule_with_operator.cc:95
passedByValue:src/variables/global.h:109 passedByValue:src/variables/global.h:109
passedByValue:src/variables/global.h:110 passedByValue:src/variables/global.h:110
passedByValue:src/parser/driver.cc:45 passedByValue:src/parser/driver.cc:45
passedByValue:src/utils/system.cc:154
passedByValue:src/utils/system.cc:166
passedByValue:test/common/modsecurity_test.cc:49 passedByValue:test/common/modsecurity_test.cc:49
passedByValue:test/common/modsecurity_test.cc:98 passedByValue:test/common/modsecurity_test.cc:98