X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d775fa82354a1f8d5db87ad1d71ab00ef7d9123c..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/common/sckaddr.cpp?ds=inline diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index 2e78e0e2a0..a3b1c1767f 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sckaddr.cpp +// Name: src/common/sckaddr.cpp // Purpose: Network address manager // Author: Guilhem Lavaux // Modified by: @@ -9,21 +9,16 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "sckaddr.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_SOCKETS #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/object.h" #include "wx/log.h" #include "wx/intl.h" @@ -47,7 +42,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxIPaddress) #if wxUSE_IPV6 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxIPaddress) #endif -#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) +#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) #endif @@ -86,8 +81,11 @@ wxSockAddress::~wxSockAddress() void wxSockAddress::SetAddress(GAddress *address) { - GAddress_destroy(m_address); - m_address = GAddress_copy(address); + if ( address != m_address ) + { + GAddress_destroy(m_address); + m_address = GAddress_copy(address); + } } wxSockAddress& wxSockAddress::operator=(const wxSockAddress& addr) @@ -141,7 +139,7 @@ wxIPV4address::~wxIPV4address() bool wxIPV4address::Hostname(const wxString& name) { // Some people are sometimes fool. - if (name == wxT("")) + if (name.empty()) { wxLogWarning( _("Trying to solve a NULL hostname: giving up") ); return false; @@ -209,19 +207,18 @@ 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) + return wxString::Format(_T("%lu.%lu.%lu.%lu"), + (raw>>24) & 0xff, + (raw>>16) & 0xff, + (raw>>8) & 0xff, + raw & 0xff ); } -bool wxIPV4address::operator==(wxIPV4address& addr) +bool wxIPV4address::operator==(const wxIPV4address& addr) const { - if(Hostname().Cmp(addr.Hostname().c_str()) == 0 && Service() == addr.Service()) return true; - return false; + return Hostname().Cmp(addr.Hostname().c_str()) == 0 && + Service() == addr.Service(); } #if wxUSE_IPV6 @@ -245,7 +242,7 @@ wxIPV6address::~wxIPV6address() bool wxIPV6address::Hostname(const wxString& name) { - if (name == wxT("")) + if (name.empty()) { wxLogWarning( _("Trying to solve a NULL hostname: giving up") ); return false; @@ -311,7 +308,7 @@ unsigned short wxIPV6address::Service() const #endif // wxUSE_IPV6 -#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) +#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) // --------------------------------------------------------------------------- // wxUNIXaddress