From b084a9bf0aeecee6e15c62cddf743ce07389a60f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 24 Jan 2022 10:58:22 -0500 Subject: input_common/udp_client: Prevent unnecessary string copies We can also remove some redundant const on the return values, since these don't do anything --- src/input_common/drivers/udp_client.cpp | 4 ++-- src/input_common/drivers/udp_client.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp index 9aaeb91be..8f27435a8 100644 --- a/src/input_common/drivers/udp_client.cpp +++ b/src/input_common/drivers/udp_client.cpp @@ -339,7 +339,7 @@ void UDPClient::StartCommunication(std::size_t client, const std::string& host, } } -const PadIdentifier UDPClient::GetPadIdentifier(std::size_t pad_index) const { +PadIdentifier UDPClient::GetPadIdentifier(std::size_t pad_index) const { const std::size_t client = pad_index / PADS_PER_CLIENT; return { .guid = clients[client].uuid, @@ -348,7 +348,7 @@ const PadIdentifier UDPClient::GetPadIdentifier(std::size_t pad_index) const { }; } -const Common::UUID UDPClient::GetHostUUID(const std::string host) const { +Common::UUID UDPClient::GetHostUUID(const std::string& host) const { const auto ip = boost::asio::ip::address_v4::from_string(host); const auto hex_host = fmt::format("{:06x}", ip.to_ulong()); return Common::UUID{hex_host}; diff --git a/src/input_common/drivers/udp_client.h b/src/input_common/drivers/udp_client.h index 61a1fff37..30d7c2682 100644 --- a/src/input_common/drivers/udp_client.h +++ b/src/input_common/drivers/udp_client.h @@ -145,8 +145,8 @@ private: void OnPortInfo(Response::PortInfo); void OnPadData(Response::PadData, std::size_t client); void StartCommunication(std::size_t client, const std::string& host, u16 port); - const PadIdentifier GetPadIdentifier(std::size_t pad_index) const; - const Common::UUID GetHostUUID(const std::string host) const; + PadIdentifier GetPadIdentifier(std::size_t pad_index) const; + Common::UUID GetHostUUID(const std::string& host) const; Common::Input::ButtonNames GetUIButtonName(const Common::ParamPackage& params) const; -- cgit v1.2.3