From 840baac1e1ab36bd634dfe1119a9918aa8a6ace4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Miko=C5=82ajczyk?= Date: Mon, 14 Jul 2025 20:32:35 +0100 Subject: [PATCH] clang-format --- src/core/libraries/network/net.cpp | 11 ++++------- src/core/libraries/network/net_epoll.cpp | 1 - src/core/libraries/network/net_epoll.h | 2 +- src/core/libraries/network/net_util.cpp | 16 ++++++++-------- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/core/libraries/network/net.cpp b/src/core/libraries/network/net.cpp index c560fc214..b3837f317 100644 --- a/src/core/libraries/network/net.cpp +++ b/src/core/libraries/network/net.cpp @@ -686,8 +686,7 @@ int PS4_SYSV_ABI sceNetEpollControl(OrbisNetId epollid, OrbisNetEpollFlag op, Or } auto find_id = [&](OrbisNetId id) { - return std::ranges::find_if(epoll->events, - [&](const auto& el) { return el.first == id; }); + return std::ranges::find_if(epoll->events, [&](const auto& el) { return el.first == id; }); }; switch (op) { @@ -709,8 +708,7 @@ int PS4_SYSV_ABI sceNetEpollControl(OrbisNetId epollid, OrbisNetEpollFlag op, Or const auto socket = file->socket; epoll_event native_event = {.events = ConvertEpollEventsIn(event->events), .data = {.fd = id}}; - ASSERT(epoll_ctl(epoll->epoll_fd, EPOLL_CTL_ADD, socket->Native(), - &native_event) == 0); + ASSERT(epoll_ctl(epoll->epoll_fd, EPOLL_CTL_ADD, socket->Native(), &native_event) == 0); LOG_DEBUG(Lib_Net, "epoll_ctl succeeded"); #endif epoll->events.emplace_back(id, *event); @@ -802,9 +800,8 @@ int PS4_SYSV_ABI sceNetEpollWait(OrbisNetId epollid, OrbisNetEpollEvent* events, const auto& current_event = native_events[i]; LOG_INFO(Lib_Net, "native_event[{}] = ( .events = {}, .data = {:#x} )", i, current_event.events, current_event.data.u64); - const auto it = std::ranges::find_if(epoll->events, [&](auto& el) { - return el.first == current_event.data.fd; - }); + const auto it = std::ranges::find_if( + epoll->events, [&](auto& el) { return el.first == current_event.data.fd; }); ASSERT(it != epoll->events.end()); events[i] = { .events = ConvertEpollEventsOut(current_event.events), diff --git a/src/core/libraries/network/net_epoll.cpp b/src/core/libraries/network/net_epoll.cpp index 1c7bf3dbb..5a1d34fe8 100644 --- a/src/core/libraries/network/net_epoll.cpp +++ b/src/core/libraries/network/net_epoll.cpp @@ -58,7 +58,6 @@ int EpollTable::CreateHandle(const char* name) { void EpollTable::DeleteHandle(int d) { UNREACHABLE(); - } Epoll* EpollTable::GetEpoll(int d) { diff --git a/src/core/libraries/network/net_epoll.h b/src/core/libraries/network/net_epoll.h index c34e2d4b6..5363efff0 100644 --- a/src/core/libraries/network/net_epoll.h +++ b/src/core/libraries/network/net_epoll.h @@ -5,6 +5,7 @@ #include "common/types.h" #include "core/libraries/network/net.h" + #include #include #include @@ -40,7 +41,6 @@ private: bool destroyed{}; }; - u32 ConvertEpollEventsIn(u32 orbis_events); u32 ConvertEpollEventsOut(u32 epoll_events); diff --git a/src/core/libraries/network/net_util.cpp b/src/core/libraries/network/net_util.cpp index aaedcc12a..457ceef91 100644 --- a/src/core/libraries/network/net_util.cpp +++ b/src/core/libraries/network/net_util.cpp @@ -25,8 +25,8 @@ typedef int net_socket; #include #endif #if __linux__ -#include #include +#include #include #endif @@ -131,7 +131,7 @@ bool NetUtilInternal::RetrieveDefaultGateway() { std::string line; std::getline(route, line); - while(std::getline(route, line)) { + while (std::getline(route, line)) { std::istringstream iss{line}; std::string iface, destination, gateway; int flags; @@ -167,12 +167,13 @@ bool NetUtilInternal::RetrieveNetmask() { std::vector adapter_addresses(sizeof(IP_ADAPTER_ADDRESSES)); ULONG size_infos = sizeof(IP_ADAPTER_ADDRESSES); - if (GetAdaptersInfo(reinterpret_cast(adapter_infos.data()), &size_infos) == - ERROR_BUFFER_OVERFLOW) + if (GetAdaptersInfo(reinterpret_cast(adapter_infos.data()), + &size_infos) == ERROR_BUFFER_OVERFLOW) adapter_infos.resize(size_infos); - if (GetAdaptersInfo(reinterpret_cast(adapter_infos.data()), &size_infos) == - NO_ERROR && size_infos) { + if (GetAdaptersInfo(reinterpret_cast(adapter_infos.data()), + &size_infos) == NO_ERROR && + size_infos) { PIP_ADAPTER_ADDRESSES adapter; for (adapter = adapter_addresses; adapter; adapter = adapter->Next) { PIP_ADAPTER_UNICAST_ADDRESS unicast = adapter->FirstUnicastAddress; @@ -203,12 +204,11 @@ bool NetUtilInternal::RetrieveNetmask() { freeifaddrs(ifap); #endif - + if (success) { netmask = netmaskStr; } return success; } - } // namespace NetUtil \ No newline at end of file