summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorNiel Lebeck <niel.lebeck@gmail.com>2024-04-12 18:50:21 -0700
committerNiel Lebeck <niel.lebeck@gmail.com>2024-04-12 18:50:21 -0700
commitd2b96736e0d5e472afe2fc87df1ac8aa48bf3915 (patch)
tree90f7cb1d8eb14593350e3cf16d58bf3291327eb6 /Source/Core
parent107379bf74c1daf212c669abaa1d21f335abc62a (diff)
Pass SettingsHandler buffers by const ref instead of rvalue ref
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Common/SettingsHandler.cpp8
-rw-r--r--Source/Core/Common/SettingsHandler.h4
-rw-r--r--Source/Core/Core/Boot/Boot_BS2Emu.cpp2
-rw-r--r--Source/Core/Core/IOS/DolphinDevice.cpp2
-rw-r--r--Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp4
5 files changed, 10 insertions, 10 deletions
diff --git a/Source/Core/Common/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp
index dd84b6967b..e737a97620 100644
--- a/Source/Core/Common/SettingsHandler.cpp
+++ b/Source/Core/Common/SettingsHandler.cpp
@@ -22,9 +22,9 @@ SettingsHandler::SettingsHandler()
Reset();
}
-SettingsHandler::SettingsHandler(Buffer&& buffer)
+SettingsHandler::SettingsHandler(const Buffer& buffer)
{
- SetBytes(std::move(buffer));
+ SetBytes(buffer);
}
const SettingsHandler::Buffer& SettingsHandler::GetBytes() const
@@ -32,10 +32,10 @@ const SettingsHandler::Buffer& SettingsHandler::GetBytes() const
return m_buffer;
}
-void SettingsHandler::SetBytes(Buffer&& buffer)
+void SettingsHandler::SetBytes(const Buffer& buffer)
{
Reset();
- m_buffer = std::move(buffer);
+ m_buffer = buffer;
Decrypt();
}
diff --git a/Source/Core/Common/SettingsHandler.h b/Source/Core/Common/SettingsHandler.h
index c550e8e7f4..26d0a87d72 100644
--- a/Source/Core/Common/SettingsHandler.h
+++ b/Source/Core/Common/SettingsHandler.h
@@ -25,12 +25,12 @@ public:
using Buffer = std::array<u8, SETTINGS_SIZE>;
SettingsHandler();
- explicit SettingsHandler(Buffer&& buffer);
+ explicit SettingsHandler(const Buffer& buffer);
void AddSetting(std::string_view key, std::string_view value);
const Buffer& GetBytes() const;
- void SetBytes(Buffer&& buffer);
+ void SetBytes(const Buffer& buffer);
std::string GetValue(std::string_view key) const;
void Decrypt();
diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp
index d36b192bb5..9f1d7c19ca 100644
--- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp
+++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp
@@ -377,7 +377,7 @@ bool CBoot::SetupWiiMemory(Core::System& system, IOS::HLE::IOSC::ConsoleType con
IOS::HLE::FS::Mode::Read);
if (file && file->Read(data.data(), data.size()))
{
- gen.SetBytes(std::move(data));
+ gen.SetBytes(data);
serno = gen.GetValue("SERNO");
model = gen.GetValue("MODEL");
diff --git a/Source/Core/Core/IOS/DolphinDevice.cpp b/Source/Core/Core/IOS/DolphinDevice.cpp
index ec476b7418..f2b35d60a2 100644
--- a/Source/Core/Core/IOS/DolphinDevice.cpp
+++ b/Source/Core/Core/IOS/DolphinDevice.cpp
@@ -139,7 +139,7 @@ IPCReply GetRealProductCode(Core::System& system, const IOCtlVRequest& request)
return IPCReply(IPC_ENOENT);
Common::SettingsHandler gen;
- gen.SetBytes(std::move(data));
+ gen.SetBytes(data);
const std::string code = gen.GetValue("CODE");
const size_t length = std::min<size_t>(request.io_vectors[0].size, code.length());
diff --git a/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp b/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp
index df1457f357..6715a6c339 100644
--- a/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp
+++ b/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp
@@ -931,7 +931,7 @@ IPCReply NetKDRequestDevice::HandleRequestRegisterUserId(const IOS::HLE::IOCtlRe
return IPCReply{IPC_SUCCESS};
}
- const Common::SettingsHandler gen{std::move(data)};
+ const Common::SettingsHandler gen{data};
const std::string serno = gen.GetValue("SERNO");
const std::string form_data =
fmt::format("mlid=w{}&hdid={}&rgncd={}", m_config.Id(), m_ios.GetIOSC().GetDeviceId(), serno);
@@ -1079,7 +1079,7 @@ std::optional<IPCReply> NetKDRequestDevice::IOCtl(const IOCtlRequest& request)
Common::SettingsHandler::Buffer data;
if (file->Read(data.data(), data.size()))
{
- const Common::SettingsHandler gen{std::move(data)};
+ const Common::SettingsHandler gen{data};
area = gen.GetValue("AREA");
model = gen.GetValue("MODEL");
}