swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-01 02:15:54 -04:00
Code Issues Projects Releases Wiki Activity

Revert "Revert "newer standards prefer nullptr over NULL - this is most of them but there are others too""

Browse Source 
This reverts commit 8e2160f33e.
This commit is contained in:
DarthArgus
2016-02-11 21:19:18 -06:00
parent 8e2160f33e
commit dd9db6d350
937 changed files with 14983 additions and 14983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpMisc.cpp
Vendored
+14 -14
View File
@@ -113,19 +113,19 @@ void *UdpMisc::SmartResize(void *ptr, int bytes, int round)
if (bytes == 0)
{
if (ptr != NULL)
if (ptr != nullptr)
{
free((udp_uchar *)ptr - cAlignment);
}
return(NULL);
return(nullptr);
}
udp_uchar *ptr2;
if (ptr == NULL)
if (ptr == nullptr)
{
ptr2 = (udp_uchar *)malloc(bytes + cAlignment);
if (ptr2 == NULL)
return(NULL);
if (ptr2 == nullptr)
return(nullptr);
*(int *)ptr2 = bytes;
return(ptr2 + cAlignment);
}
@@ -135,8 +135,8 @@ void *UdpMisc::SmartResize(void *ptr, int bytes, int round)
return(ptr);
ptr2 = (udp_uchar *)realloc((udp_uchar *)ptr - cAlignment, bytes + cAlignment);
if (ptr2 == NULL)
return(NULL);
if (ptr2 == nullptr)
return(nullptr);
*(int *)ptr2 = bytes;
return(ptr2 + cAlignment);
@@ -199,30 +199,30 @@ LogicalPacket *UdpMisc::CreateQuickLogicalPacket(const void *data, int dataLen,
switch(q)
{
case 0:
tlp = new FixedLogicalPacket<cQuickFactor>(NULL, totalDataLen);
tlp = new FixedLogicalPacket<cQuickFactor>(nullptr, totalDataLen);
break;
case 1:
tlp = new FixedLogicalPacket<cQuickFactor * 2>(NULL, totalDataLen);
tlp = new FixedLogicalPacket<cQuickFactor * 2>(nullptr, totalDataLen);
break;
case 2:
case 3:
tlp = new FixedLogicalPacket<cQuickFactor * 4>(NULL, totalDataLen);
tlp = new FixedLogicalPacket<cQuickFactor * 4>(nullptr, totalDataLen);
break;
case 4:
case 5:
case 6:
case 7:
tlp = new FixedLogicalPacket<cQuickFactor * 8>(NULL, totalDataLen);
tlp = new FixedLogicalPacket<cQuickFactor * 8>(nullptr, totalDataLen);
break;
default:
tlp = new SimpleLogicalPacket(NULL, totalDataLen);
tlp = new SimpleLogicalPacket(nullptr, totalDataLen);
break;
}
udp_uchar *dest = (udp_uchar *)tlp->GetDataPtr();
if (data != NULL)
if (data != nullptr)
memcpy(dest, data, dataLen);
if (data2 != NULL)
if (data2 != nullptr)
memcpy(dest + dataLen, data2, dataLen2);
return(tlp);
}