INSANEMODE/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2025-06-11 00:27:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5142 from comex/xx-poll-events

Browse Source 
network, sockets: Replace `POLL_IN`, `POLL_OUT`, etc. constants with an `enum class PollEvents`
This commit is contained in:
Rodrigo Locatti
2020-12-09 03:52:20 -03:00
committed by GitHub
parent ce5fcb6bb2 0791082b43
commit e94dd7e2c4
6 changed files with 82 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/hle/service/sockets/bsd.cpp
View File

@ -489,18 +489,18 @@ std::pair<s32, Errno> BSD::PollImpl(std::vector<u8>& write_buffer, std::vector<u
}
for (PollFD& pollfd : fds) {
ASSERT(pollfd.revents == 0);
ASSERT(False(pollfd.revents));
if (pollfd.fd > static_cast<s32>(MAX_FD) || pollfd.fd < 0) {
LOG_ERROR(Service, "File descriptor handle={} is invalid", pollfd.fd);
pollfd.revents = 0;
pollfd.revents = PollEvents{};
return {0, Errno::SUCCESS};
}
const std::optional<FileDescriptor>& descriptor = file_descriptors[pollfd.fd];
if (!descriptor) {
LOG_ERROR(Service, "File descriptor handle={} is not allocated", pollfd.fd);
pollfd.revents = POLL_NVAL;
pollfd.revents = PollEvents::Nval;
return {0, Errno::SUCCESS};
}
}
@ -510,7 +510,7 @@ std::pair<s32, Errno> BSD::PollImpl(std::vector<u8>& write_buffer, std::vector<u
Network::PollFD result;
result.socket = file_descriptors[pollfd.fd]->socket.get();
result.events = TranslatePollEventsToHost(pollfd.events);
result.revents = 0;
result.revents = Network::PollEvents{};
return result;
});