From 30430d30241bd6595cc3ec806e3f873c4d755c4e Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Fri, 20 Jan 2012 23:42:39 -0800 Subject: [PATCH] Replace ZEROPTR() with memset. --- Sources/Plasma/CoreLib/hsMalloc.h | 2 -- .../NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp | 4 ++-- Sources/Plasma/NucleusLib/pnCrashExe/Win32/pnCreTools.cpp | 4 ++-- .../pnNetProtocol/Private/Protocols/Srv2Db/pnNpSrv2Db.cpp | 2 +- .../pnNetProtocol/Private/Protocols/Srv2Log/pnNpSrv2Log.cpp | 2 +- .../pnNetProtocol/Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.cpp | 2 +- .../Private/Protocols/Srv2Score/pnNpSrv2Score.cpp | 2 +- .../Private/Protocols/Srv2State/pnNpSrv2State.cpp | 2 +- .../Private/Protocols/Srv2Vault/pnNpSrv2Vault.cpp | 2 +- .../Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp | 4 ++-- 10 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Sources/Plasma/CoreLib/hsMalloc.h b/Sources/Plasma/CoreLib/hsMalloc.h index 643e7a84..c46e2747 100644 --- a/Sources/Plasma/CoreLib/hsMalloc.h +++ b/Sources/Plasma/CoreLib/hsMalloc.h @@ -166,8 +166,6 @@ inline void CDECL operator delete (void *, void *) {} #define ALLOCZERO(b) MemAlloc(b, kMemZero, __FILE__, __LINE__) #define ZERO(s) MemSet(&s, 0, sizeof(s)) -#define ZEROPTR(p) MemSet(p, 0, sizeof(*p)) - #ifdef __cplusplus diff --git a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp index e2c28dd2..9f5c6de4 100644 --- a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp +++ b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp @@ -196,8 +196,8 @@ static void SocketGetAddresses ( NetAddress * remoteAddr ) { // NetAddress may be bigger than sockaddr_in so start by zeroing the whole thing - ZEROPTR(localAddr); - ZEROPTR(remoteAddr); + memset(localAddr, 0, sizeof(*localAddr)); + memset(remoteAddr, 0, sizeof(*remoteAddr)); // don't have to enter critsect or validate socket before referencing it // because this routine is called before the user has a chance to close it diff --git a/Sources/Plasma/NucleusLib/pnCrashExe/Win32/pnCreTools.cpp b/Sources/Plasma/NucleusLib/pnCrashExe/Win32/pnCreTools.cpp index e1f2b7b8..6179e26b 100644 --- a/Sources/Plasma/NucleusLib/pnCrashExe/Win32/pnCreTools.cpp +++ b/Sources/Plasma/NucleusLib/pnCrashExe/Win32/pnCreTools.cpp @@ -66,7 +66,7 @@ static BOOL MYIMAGEAPI iSymGetModuleInfo ( DWORD, IMAGEHLP_MODULE * ModuleInfo ) { - ZEROPTR(ModuleInfo); + memset(ModuleInfo, 0, sizeof(*ModuleInfo)); return false; } @@ -109,7 +109,7 @@ static BOOL MYIMAGEAPI iSymGetSymFromAddr ( PIMAGEHLP_SYMBOL Symbol ) { *Displacement = 0; - ZEROPTR(Symbol); + memset(Symbol, 0, sizeof(*Symbol)); return false; } diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Db/pnNpSrv2Db.cpp b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Db/pnNpSrv2Db.cpp index 45a58e46..3d6f69c7 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Db/pnNpSrv2Db.cpp +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Db/pnNpSrv2Db.cpp @@ -83,7 +83,7 @@ bool Srv2DbValidateConnect ( return false; } - ZEROPTR(connectPtr); + memset(connectPtr, 0, sizeof(*connectPtr)); MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes)); listen->bytesProcessed += connect.dataBytes; diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Log/pnNpSrv2Log.cpp b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Log/pnNpSrv2Log.cpp index 965e4b7f..41caf681 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Log/pnNpSrv2Log.cpp +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Log/pnNpSrv2Log.cpp @@ -79,7 +79,7 @@ bool Srv2LogValidateConnect ( connect.srvType == kSrvTypeMcp || connect.srvType == kSrvTypeState || connect.srvType == kSrvTypeFile || connect.srvType == kSrvTypeDll)) return false; - ZEROPTR(connectPtr); + memset(connectPtr, 0, sizeof(*connectPtr)); MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes)); listen->bytesProcessed += connect.dataBytes; diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.cpp b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.cpp index 35d8db3e..25abebb9 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.cpp +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.cpp @@ -77,7 +77,7 @@ bool Srv2McpValidateConnect ( if (!(connect.srvType == kSrvTypeAuth || connect.srvType == kSrvTypeGame)) return false; - ZEROPTR(connectPtr); + memset(connectPtr, 0, sizeof(*connectPtr)); MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes)); listen->bytesProcessed += connect.dataBytes; diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Score/pnNpSrv2Score.cpp b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Score/pnNpSrv2Score.cpp index 39ae2cb8..87137647 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Score/pnNpSrv2Score.cpp +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Score/pnNpSrv2Score.cpp @@ -78,7 +78,7 @@ bool Srv2ScoreValidateConnect ( if (!(connect.srvType == kSrvTypeAuth || connect.srvType == kSrvTypeGame)) return false; - ZEROPTR(connectPtr); + memset(connectPtr, 0, sizeof(*connectPtr)); MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes)); listen->bytesProcessed += connect.dataBytes; diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2State/pnNpSrv2State.cpp b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2State/pnNpSrv2State.cpp index 47ca65ed..505ebfff 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2State/pnNpSrv2State.cpp +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2State/pnNpSrv2State.cpp @@ -78,7 +78,7 @@ bool Srv2StateValidateConnect ( if (!(connect.srvType == kSrvTypeAuth || connect.srvType == kSrvTypeGame)) return false; - ZEROPTR(connectPtr); + memset(connectPtr, 0, sizeof(*connectPtr)); MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes)); listen->bytesProcessed += connect.dataBytes; diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Vault/pnNpSrv2Vault.cpp b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Vault/pnNpSrv2Vault.cpp index 8a5da582..70c112cd 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Vault/pnNpSrv2Vault.cpp +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Vault/pnNpSrv2Vault.cpp @@ -77,7 +77,7 @@ bool Srv2VaultValidateConnect ( if (!(connect.srvType == kSrvTypeAuth || connect.srvType == kSrvTypeGame || connect.srvType == kSrvTypeMcp)) return false; - ZEROPTR(connectPtr); + memset(connectPtr, 0, sizeof(*connectPtr)); MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes)); listen->bytesProcessed += connect.dataBytes; diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp b/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp index 5b00b896..4e7c8545 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp +++ b/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp @@ -229,7 +229,7 @@ bool NetAddressFromString (NetAddress * addr, const wchar_t str[], unsigned defa ASSERT(str); // NetAddress is bigger than sockaddr_in so start by zeroing the whole thing - ZEROPTR(addr); + memset(addr, 0, sizeof(*addr)); for (;;) { NetAddressNode node = NodeFromString(&str); @@ -278,7 +278,7 @@ void NetAddressFromNode ( unsigned port, NetAddress * addr ) { - ZEROPTR(addr); + memset(addr, 0, sizeof(*addr)); sockaddr_in * inetaddr = (sockaddr_in *) addr; inetaddr->sin_family = AF_INET; inetaddr->sin_addr.S_un.S_addr = htonl(node);