From b40cfa2bedeb748b757e1704875d78aa981c8270 Mon Sep 17 00:00:00 2001 From: Igor Pissolati Date: Mon, 21 Apr 2025 21:52:40 -0300 Subject: [PATCH] Apply suggested changes --- src/common/utils/container.hpp | 10 ++++++---- src/windows-emulator/registry/registry_manager.cpp | 2 +- src/windows-emulator/registry/registry_manager.hpp | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/common/utils/container.hpp b/src/common/utils/container.hpp index 9c1ae8aa..e66a4dcf 100644 --- a/src/common/utils/container.hpp +++ b/src/common/utils/container.hpp @@ -4,6 +4,7 @@ #include #include #include +#include "string.hpp" namespace utils { @@ -26,9 +27,9 @@ namespace utils { size_t hash = 0; constexpr std::hash hasher{}; - for (unsigned char c : str) + for (const char c : str) { - hash ^= hasher(std::tolower(c)) + 0x9e3779b9 + (hash << 6) + (hash >> 2); + hash ^= hasher(string::char_to_lower(c)) + 0x9e3779b9 + (hash << 6) + (hash >> 2); } return hash; } @@ -40,8 +41,9 @@ namespace utils bool operator()(const std::string_view lhs, const std::string_view rhs) const { - return std::ranges::equal( - lhs, rhs, [](unsigned char c1, unsigned char c2) { return std::tolower(c1) == std::tolower(c2); }); + return std::ranges::equal(lhs, rhs, [](const char c1, const char c2) { + return string::char_to_lower(c1) == string::char_to_lower(c2); + }); } }; diff --git a/src/windows-emulator/registry/registry_manager.cpp b/src/windows-emulator/registry/registry_manager.cpp index ca3a21c3..207766f1 100644 --- a/src/windows-emulator/registry/registry_manager.cpp +++ b/src/windows-emulator/registry/registry_manager.cpp @@ -114,7 +114,7 @@ std::optional registry_manager::get_key(const utils::path_key& key return {std::move(reg_key)}; } -std::optional registry_manager::get_value(const registry_key& key, const std::string& name) +std::optional registry_manager::get_value(const registry_key& key, std::string_view name) { const auto iterator = this->hives_.find(key.hive); if (iterator == this->hives_.end()) diff --git a/src/windows-emulator/registry/registry_manager.hpp b/src/windows-emulator/registry/registry_manager.hpp index db45e733..bf601559 100644 --- a/src/windows-emulator/registry/registry_manager.hpp +++ b/src/windows-emulator/registry/registry_manager.hpp @@ -47,7 +47,7 @@ class registry_manager registry_manager& operator=(const registry_manager&) = delete; std::optional get_key(const utils::path_key& key); - std::optional get_value(const registry_key& key, const std::string& name); + std::optional get_value(const registry_key& key, std::string_view name); std::optional get_value(const registry_key& key, size_t index); std::optional get_sub_key_name(const registry_key& key, size_t index);