From bdb19085c47cdfeb2051020cb5564c6ecd9605c5 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Tue, 31 May 2022 02:06:42 +0200 Subject: Common: Add utility function for case-insensitive string comparison. --- Source/Core/DiscIO/RiivolutionPatcher.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'Source/Core/DiscIO') diff --git a/Source/Core/DiscIO/RiivolutionPatcher.cpp b/Source/Core/DiscIO/RiivolutionPatcher.cpp index 4b265599d8..f12664710d 100644 --- a/Source/Core/DiscIO/RiivolutionPatcher.cpp +++ b/Source/Core/DiscIO/RiivolutionPatcher.cpp @@ -320,14 +320,6 @@ static void ApplyPatchToFile(const Patch& patch, const File& file_patch, file_patch.m_fileoffset, file_patch.m_length, file_patch.m_resize); } -static bool CaseInsensitiveEquals(std::string_view a, std::string_view b) -{ - if (a.size() != b.size()) - return false; - return std::equal(a.begin(), a.end(), b.begin(), - [](char ca, char cb) { return Common::ToLower(ca) == Common::ToLower(cb); }); -} - static FSTBuilderNode* FindFileNodeInFST(std::string_view path, std::vector* fst, bool create_if_not_exists) { @@ -335,7 +327,7 @@ static FSTBuilderNode* FindFileNodeInFST(std::string_view path, std::vectorbegin(), fst->end(), [&](const FSTBuilderNode& node) { - return CaseInsensitiveEquals(node.m_filename, name); + return Common::CaseInsensitiveEquals(node.m_filename, name); }); if (it == fst->end()) @@ -377,7 +369,7 @@ static DiscIO::FSTBuilderNode* FindFilenameNodeInFST(std::string_view filename, if (result) return result; } - else if (CaseInsensitiveEquals(node.m_filename, filename)) + else if (Common::CaseInsensitiveEquals(node.m_filename, filename)) { return &node; } @@ -398,7 +390,7 @@ static void ApplyFilePatchToFST(const Patch& patch, const File& file, if (node) ApplyPatchToFile(patch, file, node); } - else if (dol_node && CaseInsensitiveEquals(file.m_disc, "main.dol")) + else if (dol_node && Common::CaseInsensitiveEquals(file.m_disc, "main.dol")) { // Special case: If the filename is "main.dol", we want to patch the main executable. ApplyPatchToFile(patch, file, dol_node); -- cgit v1.2.3