X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/377f6397acbe8eb5ac85be5e141eb2572f01b13b..3b01b1fe4cb656f39290bf7f3891667855abe601:/src/common/sckaddr.cpp diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index f158a55768..2e78e0e2a0 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -144,7 +144,7 @@ bool wxIPV4address::Hostname(const wxString& name) if (name == wxT("")) { wxLogWarning( _("Trying to solve a NULL hostname: giving up") ); - return FALSE; + return false; } m_origHostname = name; return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR); @@ -207,21 +207,21 @@ wxSockAddress *wxIPV4address::Clone() const } wxString wxIPV4address::IPAddress() const -{ - unsigned long raw = GAddress_INET_GetHostAddress(m_address); - return wxString::Format( - _T("%u.%u.%u.%u"), - (unsigned char)((raw>>24) & 0xff), - (unsigned char)((raw>>16) & 0xff), - (unsigned char)((raw>>8) & 0xff), - (unsigned char)(raw & 0xff) - ); +{ + unsigned long raw = GAddress_INET_GetHostAddress(m_address); + return wxString::Format( + _T("%u.%u.%u.%u"), + (unsigned char)((raw>>24) & 0xff), + (unsigned char)((raw>>16) & 0xff), + (unsigned char)((raw>>8) & 0xff), + (unsigned char)(raw & 0xff) + ); } bool wxIPV4address::operator==(wxIPV4address& addr) { - if(Hostname().Cmp(addr.Hostname().c_str()) == 0 && Service() == addr.Service()) return true; - return false; + if(Hostname().Cmp(addr.Hostname().c_str()) == 0 && Service() == addr.Service()) return true; + return false; } #if wxUSE_IPV6 @@ -248,14 +248,14 @@ bool wxIPV6address::Hostname(const wxString& name) if (name == wxT("")) { wxLogWarning( _("Trying to solve a NULL hostname: giving up") ); - return FALSE; + return false; } return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR); } bool wxIPV6address::Hostname(unsigned char[16] WXUNUSED(addr)) { - return TRUE; + return true; } bool wxIPV6address::Service(const wxString& name) @@ -284,15 +284,15 @@ bool wxIPV6address::AnyAddress() } wxString wxIPV6address::IPAddress() const -{ - unsigned long raw = GAddress_INET_GetHostAddress(m_address); - return wxString::Format( - _T("%u.%u.%u.%u"), - (unsigned char)((raw>>24) & 0xff), - (unsigned char)((raw>>16) & 0xff), - (unsigned char)((raw>>8) & 0xff), - (unsigned char)(raw & 0xff) - ); +{ + unsigned long raw = GAddress_INET_GetHostAddress(m_address); + return wxString::Format( + _T("%u.%u.%u.%u"), + (unsigned char)((raw>>24) & 0xff), + (unsigned char)((raw>>16) & 0xff), + (unsigned char)((raw>>8) & 0xff), + (unsigned char)(raw & 0xff) + ); } wxString wxIPV6address::Hostname() const @@ -342,7 +342,7 @@ wxString wxUNIXaddress::Filename() path[0] = 0; GAddress_UNIX_GetPath(m_address, path, 1024); - + return wxString::FromAscii(path); }