From 2808903663d81ebcf570ce78ebecdc9002151f88 Mon Sep 17 00:00:00 2001 From: ANR2ME Date: Mon, 14 Sep 2020 03:36:39 +0700 Subject: [PATCH] Making sure the are no compiler warnings on adhoc code on android --- Core/HLE/proAdhoc.cpp | 2 +- Core/HLE/sceNetAdhoc.cpp | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp index 85534e45e9..405e400d1c 100644 --- a/Core/HLE/proAdhoc.cpp +++ b/Core/HLE/proAdhoc.cpp @@ -1328,7 +1328,7 @@ int friendFinder(){ else { // Update Ping Time lastping = now; - DEBUG_LOG(SCENET, "FriendFinder: Sending OPCODE_PING (%llu)", now); + DEBUG_LOG(SCENET, "FriendFinder: Sending OPCODE_PING (%llu)", static_cast(now)); } } } diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index 76654c3745..f9a1d8ed8f 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -1553,10 +1553,8 @@ int PollAdhocSocket(SceNetAdhocPollSd* sds, int count, int timeout) { if (affectedsockets > 0) { affectedsockets = 0; for (int i = 0; i < count; i++) { - s32_le* fd_flags; if (sds[i].id > 0 && sds[i].id <= MAX_SOCKET && adhocSockets[sds[i].id - 1] != NULL) { auto sock = adhocSockets[sds[i].id - 1]; - fd_flags = &sock->flags; if (sock->type == SOCK_PTP) { fd = sock->data.ptp.id; } @@ -1572,10 +1570,10 @@ int PollAdhocSocket(SceNetAdhocPollSd* sds, int count, int timeout) { sds[i].revents |= ADHOC_EV_ALERT; // Does Alert can be raised on revents regardless of events bitmask? if (sds[i].revents) affectedsockets++; - if (*fd_flags & ADHOC_F_ALERTPOLL) { + if (sock->flags & ADHOC_F_ALERTPOLL) { affectedsockets = ERROR_NET_ADHOC_SOCKET_ALERTED; // FIXME: Should we clear the flag after alert signaled? - *fd_flags &= ~ADHOC_F_ALERTPOLL; + sock->flags &= ~ADHOC_F_ALERTPOLL; break; } }