Added wxVector::swap().

[wxWidgets.git] / src / common / sckaddr.cpp

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 1eed7359859ba50b37e0b56f79a06d14dc129a2e..9e21624fed06df1fd95b737a4949e0c62e286c9c 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -392,7 +392,8 @@ servent *wxGetservbyname_r(const char *port,
 #elif defined(HAVE_FUNC_GETSERVBYNAME_R_5)
     se = getservbyname_r(port, protocol, serv, buffer, size);
 #elif defined(HAVE_FUNC_GETSERVBYNAME_R_4)
 #elif defined(HAVE_FUNC_GETSERVBYNAME_R_5)
     se = getservbyname_r(port, protocol, serv, buffer, size);
 #elif defined(HAVE_FUNC_GETSERVBYNAME_R_4)

-    se = getservbyname_r(port, protocol, serv, &buffer);
+    if ( getservbyname_r(port, protocol, serv, &buffer) != 0 )
+        return NULL;

 #elif defined(HAVE_GETSERVBYNAME)
     wxLOCK_GETBY_MUTEX(serv);
 
 #elif defined(HAVE_GETSERVBYNAME)
     wxLOCK_GETBY_MUTEX(serv);
 


@@ -507,7 +508,7 @@ bool wxSockAddressImpl::SetHostName4(const wxString& name)
     if ( !addr )
         return false;
 
     if ( !addr )
         return false;
 

-    const wxUTF8Buf namebuf(name.utf8_str());
+    const wxScopedCharBuffer namebuf(name.utf8_str());

 
     // first check if this is an address in quad dotted notation
 #if defined(HAVE_INET_ATON)
 
     // first check if this is an address in quad dotted notation
 #if defined(HAVE_INET_ATON)


@@ -694,7 +695,7 @@ bool wxSockAddressImpl::SetPath(const wxString& path)
     if ( !addr )
         return false;
 
     if ( !addr )
         return false;
 

-    const wxUTF8Buf buf(path.utf8_str());
+    const wxScopedCharBuffer buf(path.utf8_str());

     if ( strlen(buf) >= UNIX_PATH_MAX )
         return false;
 
     if ( strlen(buf) >= UNIX_PATH_MAX )
         return false;
 


@@ -721,6 +722,16 @@ wxString wxSockAddressImpl::GetPath() const
 // wxSockAddress
 // ----------------------------------------------------------------------------
 
 // wxSockAddress
 // ----------------------------------------------------------------------------
 

+const sockaddr *wxSockAddress::GetAddressData() const
+{
+    return GetAddress().GetAddr();
+}
+
+int wxSockAddress::GetAddressDataLen() const
+{
+    return GetAddress().GetLen();
+}
+

 void wxSockAddress::Init()
 {
     if ( !wxSocketBase::IsInitialized() )
 void wxSockAddress::Init()
 {
     if ( !wxSocketBase::IsInitialized() )