Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IniFile: Remove redundant function, add a debug assert

Browse Source
This commit is contained in:
Henrik Rydgård 2023-11-06 17:56:56 -06:00
parent c5469c409a
commit 73932603e3
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Common/Data/Format/IniFile.cpp
View File

@ -7,6 +7,7 @@
#include <inttypes.h> #include <inttypes.h>
// Hm, what's this for?
#ifndef _MSC_VER #ifndef _MSC_VER
#include <strings.h> #include <strings.h>
#endif #endif
@ -19,23 +20,14 @@
#include <vector> #include <vector>
#include "Common/Data/Format/IniFile.h" #include "Common/Data/Format/IniFile.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/File/VFS/VFS.h" #include "Common/File/VFS/VFS.h"
#include "Common/File/FileUtil.h" #include "Common/File/FileUtil.h"
#include "Common/Data/Text/Parsers.h" #include "Common/Log.h"
#include "Common/Math/math_util.h"
#ifdef _WIN32
#include "Common/Data/Encoding/Utf8.h"
#endif
#include "Common/StringUtils.h" #include "Common/StringUtils.h"
bool StringViewEqualCaseInsensitive(const std::string_view lhs, const std::string_view rhs) {
if (lhs.size() != rhs.size()) {
return false;
}
return ::strncasecmp(lhs.data(), rhs.data(), rhs.size()) == 0;
}
// This unescapes # signs. // This unescapes # signs.
// NOTE: These parse functions can make better use of the string_view - the pos argument should not be needed, for example. // NOTE: These parse functions can make better use of the string_view - the pos argument should not be needed, for example.
static bool ParseLineKey(std::string_view line, size_t &pos, std::string *keyOut) { static bool ParseLineKey(std::string_view line, size_t &pos, std::string *keyOut) {
@ -199,7 +191,7 @@ void Section::Clear() {
ParsedIniLine *Section::GetLine(const char *key) { ParsedIniLine *Section::GetLine(const char *key) {
for (auto &line : lines_) { for (auto &line : lines_) {
if (StringViewEqualCaseInsensitive(line.Key(), key)) if (equalsNoCase(line.Key(), key))
return &line; return &line;
} }
return nullptr; return nullptr;
@ -207,7 +199,7 @@ ParsedIniLine *Section::GetLine(const char *key) {
const ParsedIniLine *Section::GetLine(const char* key) const { const ParsedIniLine *Section::GetLine(const char* key) const {
for (auto &line : lines_) { for (auto &line : lines_) {
if (StringViewEqualCaseInsensitive(line.Key(), key)) if (equalsNoCase(line.Key(), key))
return &line; return &line;
} }
return nullptr; return nullptr;
@ -222,6 +214,7 @@ void Section::Set(const char* key, uint64_t newValue) {
} }
void Section::Set(const char* key, float newValue) { void Section::Set(const char* key, float newValue) {
_dbg_assert_(!my_isnanorinf(newValue));
Set(key, StringFromFormat("%f", newValue).c_str()); Set(key, StringFromFormat("%f", newValue).c_str());
} }
@ -397,7 +390,7 @@ bool Section::Get(const char* key, double* value, double defaultValue) const
bool Section::Exists(const char *key) const { bool Section::Exists(const char *key) const {
for (auto &line : lines_) { for (auto &line : lines_) {
if (StringViewEqualCaseInsensitive(key, line.Key())) if (equalsNoCase(key, line.Key()))
return true; return true;
} }
return false; return false;