From 37e78942edf279d6e3e973a54c1f4696cdd299b8 Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Fri, 27 Sep 2024 13:52:13 -0600 Subject: [PATCH] Use functions from the C++ standard library --- src/CSFML/Network/IpAddress.cpp | 4 ++-- src/CSFML/Network/TcpSocket.cpp | 2 +- src/CSFML/Network/UdpSocket.cpp | 4 ++-- src/CSFML/System/Alloc.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CSFML/Network/IpAddress.cpp b/src/CSFML/Network/IpAddress.cpp index df5fb51..fe7c86f 100644 --- a/src/CSFML/Network/IpAddress.cpp +++ b/src/CSFML/Network/IpAddress.cpp @@ -41,7 +41,7 @@ namespace if (address) { - strncpy(result.address, address->toString().c_str(), 15); + std::strncpy(result.address, address->toString().c_str(), 15); } return result; @@ -97,7 +97,7 @@ sfIpAddress sfIpAddress_fromInteger(uint32_t address) void sfIpAddress_toString(sfIpAddress address, char* string) { if (string) - strcpy(string, address.address); + std::strcpy(string, address.address); } diff --git a/src/CSFML/Network/TcpSocket.cpp b/src/CSFML/Network/TcpSocket.cpp index 0c4e5d9..abd9e21 100644 --- a/src/CSFML/Network/TcpSocket.cpp +++ b/src/CSFML/Network/TcpSocket.cpp @@ -82,7 +82,7 @@ sfIpAddress sfTcpSocket_getRemoteAddress(const sfTcpSocket* socket) sfIpAddress result = sfIpAddress_None; if (address) { - strncpy(result.address, address->toString().c_str(), 15); + std::strncpy(result.address, address->toString().c_str(), 15); } return result; diff --git a/src/CSFML/Network/UdpSocket.cpp b/src/CSFML/Network/UdpSocket.cpp index bea9e8d..31b31b5 100644 --- a/src/CSFML/Network/UdpSocket.cpp +++ b/src/CSFML/Network/UdpSocket.cpp @@ -139,7 +139,7 @@ sfSocketStatus sfUdpSocket_receive(sfUdpSocket* socket, if (address) { - strncpy(remoteAddress->address, address->toString().c_str(), 15); + std::strncpy(remoteAddress->address, address->toString().c_str(), 15); } } @@ -187,7 +187,7 @@ sfSocketStatus sfUdpSocket_receivePacket(sfUdpSocket* socket, sfPacket* packet, if (address) { - strncpy(remoteAddress->address, address->toString().c_str(), 15); + std::strncpy(remoteAddress->address, address->toString().c_str(), 15); } } diff --git a/src/CSFML/System/Alloc.cpp b/src/CSFML/System/Alloc.cpp index 546fc95..713f3ee 100644 --- a/src/CSFML/System/Alloc.cpp +++ b/src/CSFML/System/Alloc.cpp @@ -33,5 +33,5 @@ //////////////////////////////////////////////////////////// void sfFree(void* ptr) { - free(ptr); + std::free(ptr); }