From 6d41088153b4b932b4f2524d4252993a5642f998 Mon Sep 17 00:00:00 2001
From: FearlessTobi <thm.frey@gmail.com>
Date: Mon, 1 Aug 2022 22:47:39 +0200
Subject: core, yuzu: Address first part of review comments

---
 src/core/internal_network/socket_proxy.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/core/internal_network/socket_proxy.cpp')

diff --git a/src/core/internal_network/socket_proxy.cpp b/src/core/internal_network/socket_proxy.cpp
index b9c50430e..216893ba1 100644
--- a/src/core/internal_network/socket_proxy.cpp
+++ b/src/core/internal_network/socket_proxy.cpp
@@ -30,19 +30,19 @@ void ProxySocket::HandleProxyPacket(const ProxyPacket& packet) {
         closed) {
         return;
     }
-    std::lock_guard<std::mutex> guard(packets_mutex);
+    std::lock_guard guard(packets_mutex);
     received_packets.push(packet);
 }
 
 template <typename T>
-Errno ProxySocket::SetSockOpt(SOCKET _fd, int option, T value) {
+Errno ProxySocket::SetSockOpt(SOCKET fd_, int option, T value) {
     socket_options[option] = reinterpret_cast<const char*>(&value);
     return Errno::SUCCESS;
 }
 
 Errno ProxySocket::Initialize(Domain domain, Type type, Protocol socket_protocol) {
     protocol = socket_protocol;
-    socket_options[0x1008] = reinterpret_cast<const char*>(&type);
+    SetSockOpt(fd, SO_TYPE, type);
 
     return Errno::SUCCESS;
 }
@@ -101,7 +101,7 @@ std::pair<s32, Errno> ProxySocket::RecvFrom(int flags, std::vector<u8>& message,
     ASSERT(message.size() < static_cast<size_t>(std::numeric_limits<int>::max()));
 
     {
-        std::lock_guard<std::mutex> guard(packets_mutex);
+        std::lock_guard guard(packets_mutex);
         if (received_packets.size() > 0) {
             return ReceivePacket(flags, message, addr, message.size());
         }
@@ -115,7 +115,7 @@ std::pair<s32, Errno> ProxySocket::RecvFrom(int flags, std::vector<u8>& message,
         return {-1, Errno::AGAIN};
     }
 
-    std::lock_guard<std::mutex> guard(packets_mutex);
+    std::lock_guard guard(packets_mutex);
     if (received_packets.size() > 0) {
         return ReceivePacket(flags, message, addr, message.size());
     }
-- 
cgit v1.2.3