use void pointers, not char ones, in socket IO functions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index fe5d5a2942c35c8228ce200b33a8e6e01e78eacf..d65e493b982501818799758614c157925366b5ba 100644 (file)
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -40,8 +40,8 @@ public:
     virtual wxSocketImpl *WaitConnection(wxSocketBase& wxsocket);
 
 
     virtual wxSocketImpl *WaitConnection(wxSocketBase& wxsocket);
 
 

-    int Read(char *buffer, int size);
-    int Write(const char *buffer, int size);
+    int Read(void *buffer, int size);
+    int Write(const void *buffer, int size);

 
 private:
     virtual wxSocketError DoHandleConnect(int ret);
 
 private:
     virtual wxSocketError DoHandleConnect(int ret);


@@ -57,10 +57,10 @@ private:
     wxSocketError Input_Timeout();
     wxSocketError Output_Timeout();
     wxSocketError Connect_Timeout();
     wxSocketError Input_Timeout();
     wxSocketError Output_Timeout();
     wxSocketError Connect_Timeout();

-    int Recv_Stream(char *buffer, int size);
-    int Recv_Dgram(char *buffer, int size);
-    int Send_Stream(const char *buffer, int size);
-    int Send_Dgram(const char *buffer, int size);
+    int Recv_Stream(void *buffer, int size);
+    int Recv_Dgram(void *buffer, int size);
+    int Send_Stream(const void *buffer, int size);
+    int Send_Dgram(const void *buffer, int size);

 
     int m_msgnumber;
 
 
     int m_msgnumber;
 

diff --git a/include/wx/private/socket.h b/include/wx/private/socket.h
index e1c2f6ad254dce0867056b77e6d656222a0ced18..530253689fc66a28c4c00dcb767f3314b4af5cf5 100644 (file)
--- a/include/wx/private/socket.h
+++ b/include/wx/private/socket.h
@@ -252,8 +252,8 @@ public:
     // IO operations
     // -------------
 
     // IO operations
     // -------------
 

-    virtual int Read(char *buffer, int size) = 0;
-    virtual int Write(const char *buffer, int size) = 0;
+    virtual int Read(void *buffer, int size) = 0;
+    virtual int Write(const void *buffer, int size) = 0;

 
     wxSocketEventFlags Select(wxSocketEventFlags flags);
 
 
     wxSocketEventFlags Select(wxSocketEventFlags flags);
 

diff --git a/include/wx/unix/private/sockunix.h b/include/wx/unix/private/sockunix.h
index dd83004505b230fb30f91a9aa1a48f6762fa64fe..71395e5244a1ee6e41bf2f8d8360b7b3cdd39cdd 100644 (file)
--- a/include/wx/unix/private/sockunix.h
+++ b/include/wx/unix/private/sockunix.h
@@ -33,8 +33,8 @@ public:
     virtual void Shutdown();
     virtual wxSocketImpl *WaitConnection(wxSocketBase& wxsocket);
 
     virtual void Shutdown();
     virtual wxSocketImpl *WaitConnection(wxSocketBase& wxsocket);
 

-    int Read(char *buffer, int size);
-    int Write(const char *buffer, int size);
+    int Read(void *buffer, int size);
+    int Write(const void *buffer, int size);

     //attach or detach from main loop
     void Notify(bool flag);
 
     //attach or detach from main loop
     void Notify(bool flag);
 


@@ -103,10 +103,10 @@ private:
 
     wxSocketError Input_Timeout();
     wxSocketError Output_Timeout();
 
     wxSocketError Input_Timeout();
     wxSocketError Output_Timeout();

-    int Recv_Stream(char *buffer, int size);
-    int Recv_Dgram(char *buffer, int size);
-    int Send_Stream(const char *buffer, int size);
-    int Send_Dgram(const char *buffer, int size);
+    int Recv_Stream(void *buffer, int size);
+    int Recv_Dgram(void *buffer, int size);
+    int Send_Stream(const void *buffer, int size);
+    int Send_Dgram(const void *buffer, int size);

 
 
 protected:
 
 
 protected:

diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp
index a74fb08bba559fabba80f31808ad494c6e9d5630..c0f8b2f0855c34592145288933343d84bd9283f7 100644 (file)
--- a/src/msw/gsocket.cpp
+++ b/src/msw/gsocket.cpp
@@ -230,7 +230,7 @@ wxSocketError wxSocketImplMSW::DoHandleConnect(int ret)
 /* Generic IO */
 
 /* Like recv(), send(), ... */
 /* Generic IO */
 
 /* Like recv(), send(), ... */

-int wxSocketImplMSW::Read(char *buffer, int size)
+int wxSocketImplMSW::Read(void *buffer, int size)

 {
   int ret;
 
 {
   int ret;
 


@@ -268,7 +268,7 @@ int wxSocketImplMSW::Read(char *buffer, int size)
   return ret;
 }
 
   return ret;
 }
 

-int wxSocketImplMSW::Write(const char *buffer, int size)
+int wxSocketImplMSW::Write(const void *buffer, int size)

 {
   int ret;
 
 {
   int ret;
 


@@ -378,19 +378,20 @@ wxSocketError wxSocketImplMSW::Connect_Timeout()
   return wxSOCKET_NOERROR;
 }
 
   return wxSOCKET_NOERROR;
 }
 

-int wxSocketImplMSW::Recv_Stream(char *buffer, int size)
+int wxSocketImplMSW::Recv_Stream(void *buffer, int size)

 {
 {

-  return recv(m_fd, buffer, size, 0);
+    return recv(m_fd, static_cast<char *>(buffer), size, 0);

 }
 
 }
 

-int wxSocketImplMSW::Recv_Dgram(char *buffer, int size)
+int wxSocketImplMSW::Recv_Dgram(void *buffer, int size)

 {
   wxSockAddr from;
   WX_SOCKLEN_T fromlen = sizeof(from);
   int ret;
   wxSocketError err;
 
 {
   wxSockAddr from;
   WX_SOCKLEN_T fromlen = sizeof(from);
   int ret;
   wxSocketError err;
 

-  ret = recvfrom(m_fd, buffer, size, 0, (sockaddr*)&from, &fromlen);
+  ret = recvfrom(m_fd, static_cast<char *>(buffer),
+                 size, 0, &from, &fromlen);

 
   if (ret == SOCKET_ERROR)
     return SOCKET_ERROR;
 
   if (ret == SOCKET_ERROR)
     return SOCKET_ERROR;


@@ -417,12 +418,12 @@ int wxSocketImplMSW::Recv_Dgram(char *buffer, int size)
   return ret;
 }
 
   return ret;
 }
 

-int wxSocketImplMSW::Send_Stream(const char *buffer, int size)
+int wxSocketImplMSW::Send_Stream(const void *buffer, int size)

 {
 {

-  return send(m_fd, buffer, size, 0);
+  return send(m_fd, static_cast<const char *>(buffer), size, 0);

 }
 
 }
 

-int wxSocketImplMSW::Send_Dgram(const char *buffer, int size)
+int wxSocketImplMSW::Send_Dgram(const void *buffer, int size)

 {
   struct sockaddr *addr;
   int len, ret;
 {
   struct sockaddr *addr;
   int len, ret;


@@ -441,7 +442,7 @@ int wxSocketImplMSW::Send_Dgram(const char *buffer, int size)
     return -1;
   }
 
     return -1;
   }
 

-  ret = sendto(m_fd, buffer, size, 0, addr, len);
+  ret = sendto(m_fd, static_cast<const char *>(buffer), size, 0, addr, len);

 
   /* Frees memory allocated by _GAddress_translate_to */
   free(addr);
 
   /* Frees memory allocated by _GAddress_translate_to */
   free(addr);

diff --git a/src/unix/sockunix.cpp b/src/unix/sockunix.cpp
index 31c04877c36fbac90c4427a5ff184dd933c279fe..3d057f5b819c6f5cb131909040e75b37fe6dc51b 100644 (file)
--- a/src/unix/sockunix.cpp
+++ b/src/unix/sockunix.cpp
@@ -635,7 +635,7 @@ wxSocketError wxSocketImplUnix::DoHandleConnect(int ret)
 /* Generic IO */
 
 /* Like recv(), send(), ... */
 /* Generic IO */
 
 /* Like recv(), send(), ... */

-int wxSocketImplUnix::Read(char *buffer, int size)
+int wxSocketImplUnix::Read(void *buffer, int size)

 {
   int ret;
 
 {
   int ret;
 


@@ -697,7 +697,7 @@ int wxSocketImplUnix::Read(char *buffer, int size)
   return ret;
 }
 
   return ret;
 }
 

-int wxSocketImplUnix::Write(const char *buffer, int size)
+int wxSocketImplUnix::Write(const void *buffer, int size)

 {
   int ret;
 
 {
   int ret;
 


@@ -866,7 +866,7 @@ wxSocketError wxSocketImplUnix::Output_Timeout()
   return wxSOCKET_NOERROR;
 }
 
   return wxSOCKET_NOERROR;
 }
 

-int wxSocketImplUnix::Recv_Stream(char *buffer, int size)
+int wxSocketImplUnix::Recv_Stream(void *buffer, int size)

 {
   int ret;
   do
 {
   int ret;
   do


@@ -878,7 +878,7 @@ int wxSocketImplUnix::Recv_Stream(char *buffer, int size)
   return ret;
 }
 
   return ret;
 }
 

-int wxSocketImplUnix::Recv_Dgram(char *buffer, int size)
+int wxSocketImplUnix::Recv_Dgram(void *buffer, int size)

 {
   wxSockAddr from;
   WX_SOCKLEN_T fromlen = sizeof(from);
 {
   wxSockAddr from;
   WX_SOCKLEN_T fromlen = sizeof(from);


@@ -919,7 +919,7 @@ int wxSocketImplUnix::Recv_Dgram(char *buffer, int size)
   return ret;
 }
 
   return ret;
 }
 

-int wxSocketImplUnix::Send_Stream(const char *buffer, int size)
+int wxSocketImplUnix::Send_Stream(const void *buffer, int size)

 {
   int ret;
 
 {
   int ret;
 


@@ -927,7 +927,7 @@ int wxSocketImplUnix::Send_Stream(const char *buffer, int size)
 
   do
   {
 
   do
   {

-    ret = send(m_fd, (char *)buffer, size, GSOCKET_MSG_NOSIGNAL);
+    ret = send(m_fd, buffer, size, GSOCKET_MSG_NOSIGNAL);

   }
   while (ret == -1 && errno == EINTR); /* Loop until not interrupted */
 
   }
   while (ret == -1 && errno == EINTR); /* Loop until not interrupted */
 


@@ -936,7 +936,7 @@ int wxSocketImplUnix::Send_Stream(const char *buffer, int size)
   return ret;
 }
 
   return ret;
 }
 

-int wxSocketImplUnix::Send_Dgram(const char *buffer, int size)
+int wxSocketImplUnix::Send_Dgram(const void *buffer, int size)

 {
   struct sockaddr *addr;
   int len, ret;
 {
   struct sockaddr *addr;
   int len, ret;


@@ -959,7 +959,7 @@ int wxSocketImplUnix::Send_Dgram(const char *buffer, int size)
 
   do
   {
 
   do
   {

-    ret = sendto(m_fd, (char *)buffer, size, 0, addr, len);
+    ret = sendto(m_fd, buffer, size, 0, addr, len);

   }
   while (ret == -1 && errno == EINTR); /* Loop until not interrupted */
 
   }
   while (ret == -1 && errno == EINTR); /* Loop until not interrupted */