From cd643ab5c9f090f708c04f3b1db3c011e68415f8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 7 Sep 2020 00:57:39 -0400 Subject: bsd: Resolve sign comparison warnings --- src/core/hle/service/sockets/bsd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/hle/service/sockets/bsd.cpp') diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp index 803505452..de6b150f7 100644 --- a/src/core/hle/service/sockets/bsd.cpp +++ b/src/core/hle/service/sockets/bsd.cpp @@ -491,7 +491,7 @@ std::pair BSD::PollImpl(std::vector& write_buffer, std::vector MAX_FD || pollfd.fd < 0) { + if (pollfd.fd > static_cast(MAX_FD) || pollfd.fd < 0) { LOG_ERROR(Service, "File descriptor handle={} is invalid", pollfd.fd); pollfd.revents = 0; return {0, Errno::SUCCESS}; @@ -795,7 +795,7 @@ s32 BSD::FindFreeFileDescriptorHandle() noexcept { } bool BSD::IsFileDescriptorValid(s32 fd) const noexcept { - if (fd > MAX_FD || fd < 0) { + if (fd > static_cast(MAX_FD) || fd < 0) { LOG_ERROR(Service, "Invalid file descriptor handle={}", fd); return false; } @@ -809,7 +809,7 @@ bool BSD::IsFileDescriptorValid(s32 fd) const noexcept { bool BSD::IsBlockingSocket(s32 fd) const noexcept { // Inform invalid sockets as non-blocking // This way we avoid using a worker thread as it will fail without blocking host - if (fd > MAX_FD || fd < 0) { + if (fd > static_cast(MAX_FD) || fd < 0) { return false; } if (!file_descriptors[fd]) { -- cgit v1.2.3 From 40968e39937e3af3da399f66e7024f754ba1236b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 7 Sep 2020 01:04:36 -0400 Subject: bsd: Resolve unused value within SendToImpl Previously the address provided to SendToImpl would never be propagated to SendTo(). This fixes that. --- src/core/hle/service/sockets/bsd.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/core/hle/service/sockets/bsd.cpp') diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp index de6b150f7..7b9dd42d8 100644 --- a/src/core/hle/service/sockets/bsd.cpp +++ b/src/core/hle/service/sockets/bsd.cpp @@ -764,6 +764,7 @@ std::pair BSD::SendToImpl(s32 fd, u32 flags, const std::vector& SockAddrIn guest_addr_in; std::memcpy(&guest_addr_in, addr.data(), sizeof(guest_addr_in)); addr_in = Translate(guest_addr_in); + p_addr_in = &addr_in; } return Translate(file_descriptors[fd]->socket->SendTo(flags, message, p_addr_in)); -- cgit v1.2.3