From 4fac8d72f4e01987b9c70693677172c21cadf37b Mon Sep 17 00:00:00 2001 From: Martin Vierula Date: Fri, 28 Apr 2023 08:20:37 -0700 Subject: [PATCH] Address some constParameter complaints from cppcheck --- src/utils/string.cc | 4 ++-- src/utils/string.h | 4 ++-- src/variables/variable.h | 2 +- test/cppcheck_suppressions.txt | 2 -- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/utils/string.cc b/src/utils/string.cc index eb370eea..d0412d8e 100644 --- a/src/utils/string.cc +++ b/src/utils/string.cc @@ -225,7 +225,7 @@ void chomp(std::string *str) { } -unsigned char x2c(unsigned char *what) { +unsigned char x2c(const unsigned char *what) { unsigned char digit; digit = (what[0] >= 'A' ? ((what[0] & 0xdf) - 'A') + 10 : (what[0] - '0')); @@ -239,7 +239,7 @@ unsigned char x2c(unsigned char *what) { /** * Converts a single hexadecimal digit into a decimal value. */ -unsigned char xsingle2c(unsigned char *what) { +unsigned char xsingle2c(const unsigned char *what) { unsigned char digit; digit = (what[0] >= 'A' ? ((what[0] & 0xdf) - 'A') + 10 : (what[0] - '0')); diff --git a/src/utils/string.h b/src/utils/string.h index e3d40d89..a3f9d1b4 100644 --- a/src/utils/string.h +++ b/src/utils/string.h @@ -73,8 +73,8 @@ void replaceAll(std::string *str, const std::string& from, std::string removeWhiteSpacesIfNeeded(std::string a); std::string parserSanitizer(std::string a); -unsigned char x2c(unsigned char *what); -unsigned char xsingle2c(unsigned char *what); +unsigned char x2c(const unsigned char *what); +unsigned char xsingle2c(const unsigned char *what); unsigned char *c2x(unsigned what, unsigned char *where); } // namespace string diff --git a/src/variables/variable.h b/src/variables/variable.h index 492df4bd..984949cb 100644 --- a/src/variables/variable.h +++ b/src/variables/variable.h @@ -608,7 +608,7 @@ class Variables : public std::vector { public: bool contains(Variable *v) { return std::find_if(begin(), end(), - [v](Variable *m) -> bool { return *v == *m; }) != end(); + [v](const Variable *m) -> bool { return *v == *m; }) != end(); }; bool contains(const VariableValue *v) { return std::find_if(begin(), end(), diff --git a/test/cppcheck_suppressions.txt b/test/cppcheck_suppressions.txt index 733d3e1d..e1e398d4 100644 --- a/test/cppcheck_suppressions.txt +++ b/test/cppcheck_suppressions.txt @@ -80,8 +80,6 @@ missingInclude purgedConfiguration -constParameter - nullPointerRedundantCheck knownConditionTrueFalse cstyleCast