From 4b49edbf5ee5a7ac0e03e15cdda17807df4a73cd Mon Sep 17 00:00:00 2001 From: otavepto <153766569+otavepto@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:13:43 +0300 Subject: [PATCH] improve usage of std::string_view, passing them as const ref is useless since they don't allocated anything and cheap to copy (no allocations) --- dll/dll/local_storage.h | 2 +- dll/local_storage.cpp | 4 +-- helpers/common_helpers.cpp | 36 +++++++++++------------ helpers/common_helpers/common_helpers.hpp | 36 +++++++++++------------ helpers/pe_helpers.cpp | 2 +- helpers/pe_helpers/pe_helpers.hpp | 2 +- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dll/dll/local_storage.h b/dll/dll/local_storage.h index 0e9fd18c..a61aa83e 100644 --- a/dll/dll/local_storage.h +++ b/dll/dll/local_storage.h @@ -63,7 +63,7 @@ public: static std::vector get_filenames_path(std::string path); static std::vector get_folders_path(std::string path); - static void set_saves_folder_name(const std::string_view &str); + static void set_saves_folder_name(std::string_view str); static const std::string& get_saves_folder_name(); private: diff --git a/dll/local_storage.cpp b/dll/local_storage.cpp index d203dbb6..8ffe6531 100644 --- a/dll/local_storage.cpp +++ b/dll/local_storage.cpp @@ -80,7 +80,7 @@ std::vector Local_Storage::get_folders_path(std::string path) return std::vector(); } -void Local_Storage::set_saves_folder_name(const std::string_view &str) +void Local_Storage::set_saves_folder_name(std::string_view str) { } @@ -631,7 +631,7 @@ std::vector Local_Storage::get_folders_path(std::string path) return output; } -void Local_Storage::set_saves_folder_name(const std::string_view &str) +void Local_Storage::set_saves_folder_name(std::string_view str) { Local_Storage::saves_folder_name = str; } diff --git a/helpers/common_helpers.cpp b/helpers/common_helpers.cpp index 842eed3c..83d9b902 100644 --- a/helpers/common_helpers.cpp +++ b/helpers/common_helpers.cpp @@ -110,19 +110,19 @@ static bool create_dir_impl(std::filesystem::path &dirpath) return std::filesystem::create_directories(dirpath); } -bool common_helpers::create_dir(const std::string_view &filepath) +bool common_helpers::create_dir(std::string_view filepath) { std::filesystem::path parent(std::filesystem::u8path(filepath).parent_path()); return create_dir_impl(parent); } -bool common_helpers::create_dir(const std::wstring_view &filepath) +bool common_helpers::create_dir(std::wstring_view filepath) { std::filesystem::path parent(std::filesystem::path(filepath).parent_path()); return create_dir_impl(parent); } -void common_helpers::write(std::ofstream &file, const std::string_view &data) +void common_helpers::write(std::ofstream &file, std::string_view data) { if (!file.is_open()) { return; @@ -131,7 +131,7 @@ void common_helpers::write(std::ofstream &file, const std::string_view &data) file << data << std::endl; } -std::wstring common_helpers::str_to_w(const std::string_view &str) +std::wstring common_helpers::str_to_w(std::string_view str) { if (str.empty()) return std::wstring(); auto cvt_state = std::mbstate_t(); @@ -142,7 +142,7 @@ std::wstring common_helpers::str_to_w(const std::string_view &str) return res.substr(0, conversion_bytes); } -std::string common_helpers::wstr_to_a(const std::wstring_view &wstr) +std::string common_helpers::wstr_to_a(std::wstring_view wstr) { if (wstr.empty()) return std::string(); auto cvt_state = std::mbstate_t(); @@ -153,7 +153,7 @@ std::string common_helpers::wstr_to_a(const std::wstring_view &wstr) return res.substr(0, conversion_bytes); } -bool common_helpers::starts_with_i(const std::string_view &target, const std::string_view &query) +bool common_helpers::starts_with_i(std::string_view target, std::string_view query) { if (target.size() < query.size()) { return false; @@ -162,7 +162,7 @@ bool common_helpers::starts_with_i(const std::string_view &target, const std::st return str_cmp_insensitive(target.substr(0, query.size()), query); } -bool common_helpers::starts_with_i(const std::wstring_view &target, const std::wstring_view &query) +bool common_helpers::starts_with_i(std::wstring_view target, std::wstring_view query) { if (target.size() < query.size()) { return false; @@ -171,7 +171,7 @@ bool common_helpers::starts_with_i(const std::wstring_view &target, const std::w return str_cmp_insensitive(target.substr(0, query.size()), query); } -bool common_helpers::ends_with_i(const std::string_view &target, const std::string_view &query) +bool common_helpers::ends_with_i(std::string_view target, std::string_view query) { if (target.size() < query.size()) { return false; @@ -181,7 +181,7 @@ bool common_helpers::ends_with_i(const std::string_view &target, const std::stri return str_cmp_insensitive(target.substr(target_offset), query); } -bool common_helpers::ends_with_i(const std::wstring_view &target, const std::wstring_view &query) +bool common_helpers::ends_with_i(std::wstring_view target, std::wstring_view query) { if (target.size() < query.size()) { return false; @@ -191,7 +191,7 @@ bool common_helpers::ends_with_i(const std::wstring_view &target, const std::wst return str_cmp_insensitive(target.substr(target_offset), query); } -std::string common_helpers::string_strip(const std::string_view &str) +std::string common_helpers::string_strip(std::string_view str) { static constexpr const char whitespaces[] = " \t\r\n"; @@ -227,7 +227,7 @@ std::string common_helpers::uint8_vector_to_hex_string(const std::vector &v); -bool str_cmp_insensitive(const std::string_view &str1, const std::string_view &str2); -bool str_cmp_insensitive(const std::wstring_view &str1, const std::wstring_view &str2); +bool str_cmp_insensitive(std::string_view str1, std::string_view str2); +bool str_cmp_insensitive(std::wstring_view str1, std::wstring_view str2); std::string ascii_to_lowercase(std::string data); @@ -77,14 +77,14 @@ void thisThreadYieldFor(std::chrono::microseconds u); void consume_bom(std::ifstream &input); -std::string to_lower(const std::string_view &str); -std::wstring to_lower(const std::wstring_view &wstr); +std::string to_lower(std::string_view str); +std::wstring to_lower(std::wstring_view wstr); -std::string to_upper(const std::string_view &str); -std::wstring to_upper(const std::wstring_view &wstr); +std::string to_upper(std::string_view str); +std::wstring to_upper(std::wstring_view wstr); -std::string to_absolute(const std::string_view &path, const std::string_view &base = std::string_view()); -std::wstring to_absolute(const std::wstring_view &path, const std::wstring_view &base = std::wstring_view()); +std::string to_absolute(std::string_view path, std::string_view base = std::string_view()); +std::wstring to_absolute(std::wstring_view path, std::wstring_view base = std::wstring_view()); bool file_exist(const std::filesystem::path &filepath); bool file_exist(const std::string &filepath); diff --git a/helpers/pe_helpers.cpp b/helpers/pe_helpers.cpp index 9a7db3e0..af1d391d 100644 --- a/helpers/pe_helpers.cpp +++ b/helpers/pe_helpers.cpp @@ -464,7 +464,7 @@ const std::wstring& pe_helpers::get_current_exe_name_w() return modulename_w; } -bool pe_helpers::ends_with_i(PUNICODE_STRING target, const std::wstring_view &query) +bool pe_helpers::ends_with_i(PUNICODE_STRING target, std::wstring_view query) { return common_helpers::ends_with_i( std::wstring_view( target->Buffer, target->Length / sizeof(target->Buffer[0]) ), diff --git a/helpers/pe_helpers/pe_helpers.hpp b/helpers/pe_helpers/pe_helpers.hpp index 0f1a028c..ecca43ac 100644 --- a/helpers/pe_helpers/pe_helpers.hpp +++ b/helpers/pe_helpers/pe_helpers.hpp @@ -50,7 +50,7 @@ const std::string& get_current_exe_name(); const std::wstring& get_current_exe_name_w(); -bool ends_with_i(PUNICODE_STRING target, const std::wstring_view &query); +bool ends_with_i(PUNICODE_STRING target, std::wstring_view query); MEMORY_BASIC_INFORMATION get_mem_page_details(const void* mem);