ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed: Unnecessary ternaries in IOCTL_SO_INETATON

This commit is contained in:
Sepalani 2015-06-02 22:24:29 +02:00
parent 058d279ca4
commit f494d1f224
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp
View File

@ -921,16 +921,22 @@ IPCCommandResult CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 _CommandAddress)
std::string hostname = Memory::GetString(BufferIn); std::string hostname = Memory::GetString(BufferIn);
struct hostent* remoteHost = gethostbyname(hostname.c_str()); struct hostent* remoteHost = gethostbyname(hostname.c_str());
if (remoteHost != nullptr && remoteHost->h_addr_list != nullptr) if (remoteHost == nullptr || remoteHost->h_addr_list == nullptr || remoteHost->h_addr_list[0] == nullptr)
{
INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETATON = -1 "
"%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: None",
hostname.c_str(), BufferIn, BufferInSize, BufferOut, BufferOutSize);
ReturnValue = 0;
}
else
{
Memory::Write_U32(Common::swap32(*(u32*)remoteHost->h_addr_list[0]), BufferOut); Memory::Write_U32(Common::swap32(*(u32*)remoteHost->h_addr_list[0]), BufferOut);
INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETATON = 0 "
INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETATON = %d " "%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: %08X",
"%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: %08X", hostname.c_str(), BufferIn, BufferInSize, BufferOut, BufferOutSize,
(remoteHost == nullptr || remoteHost->h_addr_list == nullptr || remoteHost->h_addr_list[0] == nullptr) ? -1 : 0, Common::swap32(*(u32*)remoteHost->h_addr_list[0]));
hostname.c_str(), BufferIn, BufferInSize, BufferOut, BufferOutSize, ReturnValue = 1;
(remoteHost == nullptr || remoteHost->h_addr_list == nullptr) ? -1 : Common::swap32(*(u32*)remoteHost->h_addr_list[0])); }
ReturnValue = (remoteHost == nullptr || remoteHost->h_addr_list == nullptr || remoteHost->h_addr_list[0] == nullptr) ? 0 : 1;
break; break;
} }