mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use string_view in rXml

Browse Source
This commit is contained in:
Megamouse 2025-01-14 03:05:13 +01:00
parent 2643fbdea4
commit 1966171838
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Utilities/File.cpp
View File

@ -21,7 +21,7 @@ using namespace std::literals::string_literals;
#include <cwchar> #include <cwchar>
#include <Windows.h> #include <Windows.h>
static std::unique_ptr<wchar_t[]> to_wchar(const std::string& source) static std::unique_ptr<wchar_t[]> to_wchar(std::string_view source)
{ {
// String size + null terminator // String size + null terminator
const usz buf_size = source.size() + 1; const usz buf_size = source.size() + 1;
@ -44,7 +44,7 @@ static std::unique_ptr<wchar_t[]> to_wchar(const std::string& source)
std::memcpy(buffer.get() + 32768 + 4, L"UNC\\", 4 * sizeof(wchar_t)); std::memcpy(buffer.get() + 32768 + 4, L"UNC\\", 4 * sizeof(wchar_t));
} }
ensure(MultiByteToWideChar(CP_UTF8, 0, source.c_str(), size, buffer.get() + 32768 + (unc ? 8 : 4), size)); // "to_wchar" ensure(MultiByteToWideChar(CP_UTF8, 0, source.data(), size, buffer.get() + 32768 + (unc ? 8 : 4), size)); // "to_wchar"
// Canonicalize wide path (replace '/', ".", "..", \\ repetitions, etc) // Canonicalize wide path (replace '/', ".", "..", \\ repetitions, etc)
ensure(GetFullPathNameW(buffer.get() + 32768, 32768, buffer.get(), nullptr) - 1 < 32768 - 1); // "to_wchar" ensure(GetFullPathNameW(buffer.get() + 32768, 32768, buffer.get(), nullptr) - 1 < 32768 - 1); // "to_wchar"

7
Utilities/rXml.cpp
View File

@ -49,12 +49,11 @@ std::string rXmlNode::GetName()
return {}; return {};
} }
std::string rXmlNode::GetAttribute(const std::string& name) std::string rXmlNode::GetAttribute(std::string_view name)
{ {
if (handle) if (handle)
{ {
const auto pred = [&name](const pugi::xml_attribute& attr) { return (name == attr.name()); }; if (const pugi::xml_attribute attr = handle.attribute(name))
if (const pugi::xml_attribute attr = handle.find_attribute(pred))
{ {
if (const pugi::char_t* value = attr.value()) if (const pugi::char_t* value = attr.value())
{ {
@ -86,7 +85,7 @@ rXmlDocument::rXmlDocument()
{ {
} }
pugi::xml_parse_result rXmlDocument::Read(const std::string& data) pugi::xml_parse_result rXmlDocument::Read(std::string_view data)
{ {
if (handle) if (handle)
{ {

4
Utilities/rXml.h
View File

@ -23,7 +23,7 @@ struct rXmlNode
std::shared_ptr<rXmlNode> GetChildren(); std::shared_ptr<rXmlNode> GetChildren();
std::shared_ptr<rXmlNode> GetNext(); std::shared_ptr<rXmlNode> GetNext();
std::string GetName(); std::string GetName();
std::string GetAttribute(const std::string& name); std::string GetAttribute(std::string_view name);
std::string GetNodeContent(); std::string GetNodeContent();
pugi::xml_node handle{}; pugi::xml_node handle{};
@ -34,7 +34,7 @@ struct rXmlDocument
rXmlDocument(); rXmlDocument();
rXmlDocument(const rXmlDocument& other) = delete; rXmlDocument(const rXmlDocument& other) = delete;
rXmlDocument &operator=(const rXmlDocument& other) = delete; rXmlDocument &operator=(const rXmlDocument& other) = delete;
pugi::xml_parse_result Read(const std::string& data); pugi::xml_parse_result Read(std::string_view data);
virtual std::shared_ptr<rXmlNode> GetRoot(); virtual std::shared_ptr<rXmlNode> GetRoot();
pugi::xml_document handle{}; pugi::xml_document handle{};