summaryrefslogtreecommitdiff
path: root/Source/Core/Common/IniFile.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-06-16 16:57:05 -0400
committerLioncash <mathew1800@gmail.com>2019-06-16 18:20:03 -0400
commitde7e9557dceb29de00b301a56df81a6ca419c772 (patch)
tree6cbe013b384cfc6f6c1c7468d8b81961d2d3c0da /Source/Core/Common/IniFile.cpp
parentb3525ad774b336ac22137a1f5bb31a5c0d2a2154 (diff)
Common/IniFile: Make CaseInsensitiveStringCompare usable with heterogenous lookup
Previously, when performing find() operations or indexing operations on the section map, it would need to operate on a std::string key. This means cases like: map.find(some_string_view) aren't usable, which kind of sucks, especially given for most cases, we use regular string literals to perform operations in calling code. However, since C++14, it's possible to use heterogenous lookup to avoid needing to construct exact key types. In otherwords, we can perform the above or use string literals without constructing a std::string instance around them implicitly. We simply need to specify a member type within our comparison struct named is_transparent, to allow std::map to perform automatic type deduction. We also slightly alter the algorithm to an equivalent compatible with std::string_view (which need not be null-terminated), as strcasecmp requires null-terminated strings. While we're at it, we can also provide a helper function to the struct for comparing string equality rather than only less than. This allows removing other usages of strcasecmp in other functions, allowing for the transition of them to std::string_view.
Diffstat (limited to 'Source/Core/Common/IniFile.cpp')
-rw-r--r--Source/Core/Common/IniFile.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/Source/Core/Common/IniFile.cpp b/Source/Core/Common/IniFile.cpp
index 65deaa1573..74f43dc165 100644
--- a/Source/Core/Common/IniFile.cpp
+++ b/Source/Core/Common/IniFile.cpp
@@ -5,16 +5,13 @@
#include "Common/IniFile.h"
#include <algorithm>
-#include <cinttypes>
#include <cstddef>
-#include <cstring>
#include <fstream>
#include <map>
#include <string>
#include <utility>
#include <vector>
-#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/StringUtil.h"
@@ -128,16 +125,22 @@ IniFile::~IniFile() = default;
const IniFile::Section* IniFile::GetSection(const std::string& sectionName) const
{
for (const Section& sect : sections)
- if (!strcasecmp(sect.name.c_str(), sectionName.c_str()))
- return (&(sect));
+ {
+ if (CaseInsensitiveStringCompare::IsEqual(sect.name, sectionName))
+ return &sect;
+ }
+
return nullptr;
}
IniFile::Section* IniFile::GetSection(const std::string& sectionName)
{
for (Section& sect : sections)
- if (!strcasecmp(sect.name.c_str(), sectionName.c_str()))
- return (&(sect));
+ {
+ if (CaseInsensitiveStringCompare::IsEqual(sect.name, sectionName))
+ return &sect;
+ }
+
return nullptr;
}