OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00
Code Releases Activity

Fix/remove some incorrect uses of the arrsize macro

Browse Source
This commit is contained in:
Michael Hansen
2015-01-03 17:08:54 -08:00
parent e7a076b247
commit 5feefe8ea4
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Sources/Plasma/CoreLib/HeadSpin.h
View File

@ -239,6 +239,9 @@ inline double hsSwapEndianDouble(double dvalue)
*
***/
#define arrsize(a) (sizeof(a) / sizeof((a)[0]))
/* TODO: Use this safer version when MSVC finally supports constexpr */
//template <typename _T, size_t _Sz>
//constexpr size_t arrsize(_T (&)[_Sz]) { return _Sz; }
/****************************************************************************

4
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Dns.cpp
View File

@ -102,7 +102,9 @@ static void LookupProcess (Lookup * lookup, unsigned error) {
in_addr const * const * const inAddr = (in_addr **) host.h_addr_list;
// allocate a buffer large enough to hold all the addresses
size_t count = arrsize(inAddr);
size_t count = 0;
while (inAddr[count])
++count;
plNetAddress* addrs = new plNetAddress[count];
// fill in address data

14
Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp
View File

@ -561,20 +561,6 @@ static void INetAuthFileListRequestCallback (
msg->Send();
}
//============================================================================
static void INetCliAuthFileRequestCallback (
ENetError result,
void * param,
const wchar_t filename[],
hsStream * writer
) {
plNetCommFileDownloadMsg * msg = new plNetCommFileDownloadMsg;
msg->result = result;
msg->writer = writer;
StrCopy(msg->filename, filename, arrsize(filename));
msg->Send();
}
//============================================================================
static void INetCliGameJoinAgeRequestCallback (
ENetError result,