diff options
| author | Sepalani <sepalani@hotmail.fr> | 2015-06-02 22:24:29 +0200 |
|---|---|---|
| committer | Sepalani <sepalani@hotmail.fr> | 2015-06-02 22:24:29 +0200 |
| commit | f494d1f2245449b1bd8f9bc5fc3b05e62ddbbaf2 (patch) | |
| tree | 0321977de76d67922f80f026db9981596d1bde69 | |
| parent | 058d279ca4e7aafda01c54a9afa3c1a7ff36bcdb (diff) | |
Removed: Unnecessary ternaries in IOCTL_SO_INETATON
| -rw-r--r-- | Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp index cecd919c7e..43eef7776e 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp @@ -921,16 +921,22 @@ IPCCommandResult CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 _CommandAddress) std::string hostname = Memory::GetString(BufferIn); 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); - - INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETATON = %d " - "%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: %08X", - (remoteHost == nullptr || remoteHost->h_addr_list == nullptr || remoteHost->h_addr_list[0] == nullptr) ? -1 : 0, - hostname.c_str(), BufferIn, BufferInSize, BufferOut, BufferOutSize, - (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; + INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETATON = 0 " + "%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: %08X", + hostname.c_str(), BufferIn, BufferInSize, BufferOut, BufferOutSize, + Common::swap32(*(u32*)remoteHost->h_addr_list[0])); + ReturnValue = 1; + } break; } |