piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12096 from Dentomologist/nandpaths_resolve_android_warning

Browse Source 
NandPaths: Resolve Android tautological comparison warning
This commit is contained in:
Admiral H. Curtiss
2023-08-15 22:23:57 +02:00
committed by GitHub
parent 2cbc1e6f3e 9ad0d9ca6a
commit a44606692a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Common/NandPaths.cpp
View File

@ -5,7 +5,6 @@
#include <algorithm> #include <algorithm>
#include <string> #include <string>
#include <unordered_set>
#include <vector> #include <vector>
#include <fmt/format.h> #include <fmt/format.h>
@ -105,9 +104,9 @@ bool IsTitlePath(const std::string& path, std::optional<FromWhichRoot> from, u64
static bool IsIllegalCharacter(char c) static bool IsIllegalCharacter(char c)
{ {
static const std::unordered_set<char> illegal_chars = {'\"', '*', '/', ':', '<', static constexpr auto illegal_chars = {'\"', '*', '/', ':', '<', '>', '?', '\\', '|', '\x7f'};
'>', '?', '\\', '|', '\x7f'}; return static_cast<unsigned char>(c) <= 0x1F ||
return (c >= 0 && c <= 0x1F) || illegal_chars.find(c) != illegal_chars.end(); std::find(illegal_chars.begin(), illegal_chars.end(), c) != illegal_chars.end();
} }
std::string EscapeFileName(const std::string& filename) std::string EscapeFileName(const std::string& filename)