From 2ccca3a50a1bb33562efcad5d489cf705154ee8b Mon Sep 17 00:00:00 2001 From: Dennis Felsing Date: Thu, 25 Aug 2022 14:07:47 +0200 Subject: [PATCH] Fix memset compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /home/deen/isos/ddnet/ddnet-source/src/tools/map_create_pixelart.cpp: In function ‘int InsertPixelArtQuads(CQuad*, int&, const CImageInfo&, const int*, const int*, const bool*)’: /home/deen/isos/ddnet/ddnet-source/src/tools/map_create_pixelart.cpp:110:9: error: ‘memset’ was not declared in this scope 110 | memset(aVisitedPixels, 0, sizeof(bool) * Img.m_Height * Img.m_Width); | ^~~~~~ /home/deen/isos/ddnet/ddnet-source/src/tools/map_create_pixelart.cpp:8:1: note: ‘memset’ is defined in header ‘’; did you forget to ‘#include ’? 7 | #include +++ |+#include 8 | --- src/engine/server/server.cpp | 2 +- src/engine/shared/websockets.cpp | 2 +- src/tools/map_create_pixelart.cpp | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index be97c16c5..3dc212a81 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -1066,7 +1066,7 @@ int CServer::NewClientCallback(int ClientID, void *pUser, bool Sixup) pThis->m_aClients[ClientID].m_DDNetVersion = VERSION_NONE; pThis->m_aClients[ClientID].m_GotDDNetVersionPacket = false; pThis->m_aClients[ClientID].m_DDNetVersionSettled = false; - memset(&pThis->m_aClients[ClientID].m_Addr, 0, sizeof(NETADDR)); + mem_zero(&pThis->m_aClients[ClientID].m_Addr, sizeof(NETADDR)); pThis->m_aClients[ClientID].Reset(); pThis->GameServer()->OnClientEngineJoin(ClientID, Sixup); diff --git a/src/engine/shared/websockets.cpp b/src/engine/shared/websockets.cpp index 55d69a916..74dcadcbb 100644 --- a/src/engine/shared/websockets.cpp +++ b/src/engine/shared/websockets.cpp @@ -170,7 +170,7 @@ static context_data contexts[WS_CONTEXTS]; int websocket_create(const char *addr, int port) { struct lws_context_creation_info info; - memset(&info, 0, sizeof(info)); + mem_zero(&info, sizeof(info)); info.port = port; info.iface = addr; info.protocols = protocols; diff --git a/src/tools/map_create_pixelart.cpp b/src/tools/map_create_pixelart.cpp index 2926ad8ea..965b2e132 100644 --- a/src/tools/map_create_pixelart.cpp +++ b/src/tools/map_create_pixelart.cpp @@ -6,6 +6,8 @@ #include #include +#include + bool CreatePixelArt(const char[][64], const int[], const int[], int[], const bool[]); void InsertCurrentQuads(CDataFileReader &, CMapItemLayerQuads *, CQuad *); int InsertPixelArtQuads(CQuad *, int &, const CImageInfo &, const int[], const int[], const bool[]); @@ -107,7 +109,7 @@ int InsertPixelArtQuads(CQuad *pQuads, int &NumQuads, const CImageInfo &Img, con int ImgPixelSize = aPixelSizes[0], QuadPixelSize = aPixelSizes[1], OriginalNumQuads = NumQuads; int aForcedPivot[2] = {std::numeric_limits::max(), std::numeric_limits::max()}; bool *aVisitedPixels = new bool[Img.m_Height * Img.m_Width]; - memset(aVisitedPixels, 0, sizeof(bool) * Img.m_Height * Img.m_Width); + mem_zero(aVisitedPixels, sizeof(bool) * Img.m_Height * Img.m_Width); for(int y = 0; y < Img.m_Height; y += ImgPixelSize) for(int x = 0; x < Img.m_Width; x += ImgPixelSize) @@ -162,7 +164,7 @@ int GetImagePixelSize(const CImageInfo &Img) { int ImgPixelSize = std::numeric_limits::max(); bool *aVisitedPixels = new bool[Img.m_Height * Img.m_Width]; - memset(aVisitedPixels, 0, sizeof(bool) * Img.m_Height * Img.m_Width); + mem_zero(aVisitedPixels, sizeof(bool) * Img.m_Height * Img.m_Width); for(int y = 0; y < Img.m_Height && ImgPixelSize > 1; y++) for(int x = 0; x < Img.m_Width && ImgPixelSize > 1; x++)