removed some test code

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

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 6694615518d25d6232d0aba4fd7bbce520a018a3..1656a2c8b763ce06432f977ccfeb4c39aad05a65 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -61,6 +61,7 @@
 extern "C"
 {
    struct hostent *gethostbyname(const char *name); 
 extern "C"
 {
    struct hostent *gethostbyname(const char *name); 

+   int gethostname(char *name, int namelen); 

 };
 #endif
 
 };
 #endif
 


@@ -127,14 +128,14 @@ bool wxIPV4address::Hostname(const wxString& name)
     return FALSE;
   
   if (!name.IsNumber()) {
     return FALSE;
   
   if (!name.IsNumber()) {

-    if ((theHostent = gethostbyname(name.GetData())) == 0) {
+    if ((theHostent = gethostbyname(name.fn_str())) == 0) {

       return FALSE;
     }
   } else {
 #ifdef __WXMAC__
       return FALSE;
     }
   } else {
 #ifdef __WXMAC__

-    long len_addr = inet_addr(name.GetData()).s_addr ;
+    long len_addr = inet_addr(name.fn_str()).s_addr ;

 #else
 #else

-    long len_addr = inet_addr(name.GetData());
+    long len_addr = inet_addr(name.fn_str());

 #endif
     if (len_addr == -1)
       return FALSE;
 #endif
     if (len_addr == -1)
       return FALSE;


@@ -162,11 +163,11 @@ bool wxIPV4address::Service(const wxString& name)
     return FALSE;
   
   if (!name.IsNumber()) {
     return FALSE;
   
   if (!name.IsNumber()) {

-    if ((theServent = getservbyname(name, "tcp")) == 0)
+    if ((theServent = getservbyname(name.fn_str(), "tcp")) == 0)

       return FALSE;
   } else {
       return FALSE;
   } else {

-    if ((theServent = getservbyport(atoi(name), "tcp")) == 0) {
-      m_addr->sin_port = htons(atoi(name));
+    if ((theServent = getservbyport(wxAtoi(name), "tcp")) == 0) {
+      m_addr->sin_port = htons(wxAtoi(name));

       return TRUE;
     }
   }
       return TRUE;
     }
   }


@@ -398,7 +399,7 @@ const wxSockAddress& wxUNIXaddress::operator =(const wxSockAddress& addr)
 
 void wxUNIXaddress::Filename(const wxString& fname)
 {
 
 void wxUNIXaddress::Filename(const wxString& fname)
 {

-  sprintf(m_addr->sun_path, "%s", WXSTRINGCAST fname);
+  sprintf(m_addr->sun_path, "%s", MBSTRINGCAST fname.mb_str());

 }
 
 wxString wxUNIXaddress::Filename()
 }
 
 wxString wxUNIXaddress::Filename()