Replaced char* arguments for raw data with void*

colinc · Apr 3, 2012 · ad035ec · ad035ec
1 parent 9554c00
commit ad035ec
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/include/SFML/Network/Packet.h b/include/SFML/Network/Packet.h
@@ -92,7 +92,7 @@ CSFML_NETWORK_API void sfPacket_clear(sfPacket* packet);
 /// \return Pointer to the data
 ///
 ////////////////////////////////////////////////////////////
-CSFML_NETWORK_API const char* sfPacket_getData(const sfPacket* packet);
+CSFML_NETWORK_API const void* sfPacket_getData(const sfPacket* packet);
 
 ////////////////////////////////////////////////////////////
 /// \brief Get the size of the data contained in a packet

diff --git a/include/SFML/Network/TcpSocket.h b/include/SFML/Network/TcpSocket.h
@@ -159,7 +159,7 @@ CSFML_NETWORK_API void sfTcpSocket_disconnect(sfTcpSocket* socket);
 /// \return Status code
 ///
 ////////////////////////////////////////////////////////////
-CSFML_NETWORK_API sfSocketStatus sfTcpSocket_send(sfTcpSocket* socket, const char* data, size_t size);
+CSFML_NETWORK_API sfSocketStatus sfTcpSocket_send(sfTcpSocket* socket, const void* data, size_t size);
 
 ////////////////////////////////////////////////////////////
 /// \brief Receive raw data from the remote peer of a TCP socket
@@ -176,7 +176,7 @@ CSFML_NETWORK_API sfSocketStatus sfTcpSocket_send(sfTcpSocket* socket, const cha
 /// \return Status code
 ///
 ////////////////////////////////////////////////////////////
-CSFML_NETWORK_API sfSocketStatus sfTcpSocket_receive(sfTcpSocket* socket, char* data, size_t maxSize, size_t* sizeReceived);
+CSFML_NETWORK_API sfSocketStatus sfTcpSocket_receive(sfTcpSocket* socket, void* data, size_t maxSize, size_t* sizeReceived);
 
 ////////////////////////////////////////////////////////////
 /// \brief Send a formatted packet of data to the remote peer of a TCP socket

diff --git a/include/SFML/Network/UdpSocket.h b/include/SFML/Network/UdpSocket.h
@@ -137,7 +137,7 @@ CSFML_NETWORK_API void sfUdpSocket_Unbind(sfUdpSocket* socket);
 /// \return Status code
 ///
 ////////////////////////////////////////////////////////////
-CSFML_NETWORK_API sfSocketStatus sfUdpSocket_send(sfUdpSocket* socket, const char* data, size_t size, sfIpAddress address, unsigned short port);
+CSFML_NETWORK_API sfSocketStatus sfUdpSocket_send(sfUdpSocket* socket, const void* data, size_t size, sfIpAddress address, unsigned short port);
 
 ////////////////////////////////////////////////////////////
 /// \brief Receive raw data from a remote peer with a UDP socket
@@ -159,7 +159,7 @@ CSFML_NETWORK_API sfSocketStatus sfUdpSocket_send(sfUdpSocket* socket, const cha
 /// \return Status code
 ///
 ////////////////////////////////////////////////////////////
-CSFML_NETWORK_API sfSocketStatus sfUdpSocket_receive(sfUdpSocket* socket, char* data, size_t maxSize, size_t* sizeReceived, sfIpAddress* address, unsigned short* port);
+CSFML_NETWORK_API sfSocketStatus sfUdpSocket_receive(sfUdpSocket* socket, void* data, size_t maxSize, size_t* sizeReceived, sfIpAddress* address, unsigned short* port);
 
 ////////////////////////////////////////////////////////////
 /// \brief Send a formatted packet of data to a remote peer with a UDP socket

diff --git a/include/SFML/System/InputStream.h b/include/SFML/System/InputStream.h
@@ -31,7 +31,7 @@
 #include <SFML/System/Export.h>
 
 
-typedef sfInt64 (*sfInputStreamReadFunc)(char* data, sfInt64 size, void* userData);
+typedef sfInt64 (*sfInputStreamReadFunc)(void* data, sfInt64 size, void* userData);
 typedef sfInt64 (*sfInputStreamSeekFunc)(sfInt64 position, void* userData);
 typedef sfInt64 (*sfInputStreamTellFunc)(void* userData);
 typedef sfInt64 (*sfInputStreamGetSizeFunc)(void* userData);

diff --git a/src/SFML/CallbackStream.h b/src/SFML/CallbackStream.h
@@ -68,7 +68,7 @@ class CallbackStream : public sf::InputStream
     /// \return The number of bytes actually read
     ///
     ////////////////////////////////////////////////////////////
-    virtual sf::Int64 read(char* data, sf::Int64 size)
+    virtual sf::Int64 read(void* data, sf::Int64 size)
     {
         return myStream.read ? myStream.read(data, size, myStream.userData) : -1;
     }

diff --git a/src/SFML/Network/Packet.cpp b/src/SFML/Network/Packet.cpp
@@ -68,7 +68,7 @@ void sfPacket_clear(sfPacket* packet)
 
 
 ////////////////////////////////////////////////////////////
-const char* sfPacket_getData(const sfPacket* packet)
+const void* sfPacket_getData(const sfPacket* packet)
 {
     CSFML_CALL_RETURN(packet, getData(), NULL);
 }

diff --git a/src/SFML/Network/TcpSocket.cpp b/src/SFML/Network/TcpSocket.cpp
@@ -107,7 +107,7 @@ void sfTcpSocket_disconnect(sfTcpSocket* socket)
 
 
 ////////////////////////////////////////////////////////////
-sfSocketStatus sfTcpSocket_send(sfTcpSocket* socket, const char* data, size_t size)
+sfSocketStatus sfTcpSocket_send(sfTcpSocket* socket, const void* data, size_t size)
 {
     CSFML_CHECK_RETURN(socket, sfSocketError);
 
@@ -116,7 +116,7 @@ sfSocketStatus sfTcpSocket_send(sfTcpSocket* socket, const char* data, size_t si
 
 
 ////////////////////////////////////////////////////////////
-sfSocketStatus sfTcpSocket_receive(sfTcpSocket* socket, char* data, size_t maxSize, size_t* sizeReceived)
+sfSocketStatus sfTcpSocket_receive(sfTcpSocket* socket, void* data, size_t maxSize, size_t* sizeReceived)
 {
     CSFML_CHECK_RETURN(socket, sfSocketError);
 

diff --git a/src/SFML/Network/UdpSocket.cpp b/src/SFML/Network/UdpSocket.cpp
@@ -84,7 +84,7 @@ void sfUdpSocket_unbind(sfUdpSocket* socket)
 
 
 ////////////////////////////////////////////////////////////
-sfSocketStatus sfUdpSocket_send(sfUdpSocket* socket, const char* data, size_t size, sfIpAddress address, unsigned short port)
+sfSocketStatus sfUdpSocket_send(sfUdpSocket* socket, const void* data, size_t size, sfIpAddress address, unsigned short port)
 {
     CSFML_CHECK_RETURN(socket, sfSocketError);
 
@@ -96,7 +96,7 @@ sfSocketStatus sfUdpSocket_send(sfUdpSocket* socket, const char* data, size_t si
 
 
 ////////////////////////////////////////////////////////////
-sfSocketStatus sfUdpSocket_receive(sfUdpSocket* socket, char* data, size_t maxSize, size_t* sizeReceived, sfIpAddress* address, unsigned short* port)
+sfSocketStatus sfUdpSocket_receive(sfUdpSocket* socket, void* data, size_t maxSize, size_t* sizeReceived, sfIpAddress* address, unsigned short* port)
 {
     CSFML_CHECK_RETURN(socket, sfSocketError);