From c3b7a7f4f0cc5b14fd133cd27748121cbff0fe6a Mon Sep 17 00:00:00 2001
From: Martin Vierula <martin.vierula@trustwave.com>
Date: Wed, 15 Jun 2022 07:20:28 -0700
Subject: [PATCH] Change some args from pass-by-value (satisfies cppcheck)

---
 src/utils/system.cc            | 4 ++--
 src/utils/system.h             | 4 ++--
 test/cppcheck_suppressions.txt | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/utils/system.cc b/src/utils/system.cc
index 2fc571b4..690b5936 100644
--- a/src/utils/system.cc
+++ b/src/utils/system.cc
@@ -151,7 +151,7 @@ std::list<std::string> expandEnv(const std::string& var, int flags) {
     return vars;
 }
 
-bool createDir(std::string dir, int mode, std::string *error) {
+bool createDir(const std::string& dir, int mode, std::string *error) {
     int ret = mkdir(dir.data(), mode);
     if (ret != 0 && errno != EEXIST) {
         error->assign("Not able to create directory: " + dir + ": " \
@@ -163,7 +163,7 @@ bool createDir(std::string dir, int mode, std::string *error) {
 }
 
 
-bool isFile(std::string f) {
+bool isFile(const std::string& f) {
     struct stat fileInfo;
     FILE *fp = fopen(f.c_str(), "r");
     if (fp == NULL) {
diff --git a/src/utils/system.h b/src/utils/system.h
index 674fab18..b3033b44 100644
--- a/src/utils/system.h
+++ b/src/utils/system.h
@@ -33,8 +33,8 @@ std::string find_resource(const std::string& file, const std::string& config,
     std::string *err);
 std::string get_path(const std::string& file);
 std::list<std::string> expandEnv(const std::string& var, int flags);
-bool createDir(std::string dir, int mode, std::string *error);
-bool isFile(std::string f);
+bool createDir(const std::string& dir, int mode, std::string *error);
+bool isFile(const std::string& f);
 
 }  // namespace utils
 }  // namespace modsecurity
diff --git a/test/cppcheck_suppressions.txt b/test/cppcheck_suppressions.txt
index 7563c112..ca662a85 100644
--- a/test/cppcheck_suppressions.txt
+++ b/test/cppcheck_suppressions.txt
@@ -62,8 +62,6 @@ ctunullpointer:src/rule_with_operator.cc:95
 passedByValue:src/variables/global.h:109
 passedByValue:src/variables/global.h:110
 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:98