summaryrefslogtreecommitdiffstats
path: root/Tools/ProtoProxy/Connection.cpp
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-12-22 19:25:46 +0100
committerAlexander Harkness <me@bearbin.net>2017-12-22 19:25:46 +0100
commit832b39471512fa9543f981053573fb6b3342a396 (patch)
tree5738e02d526f882f9497d4d7d44d0e3aa9043230 /Tools/ProtoProxy/Connection.cpp
parentFix typo in #4095. (diff)
downloadcuberite-832b39471512fa9543f981053573fb6b3342a396.tar
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.gz
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.bz2
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.lz
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.xz
cuberite-832b39471512fa9543f981053573fb6b3342a396.tar.zst
cuberite-832b39471512fa9543f981053573fb6b3342a396.zip
Diffstat (limited to 'Tools/ProtoProxy/Connection.cpp')
-rw-r--r--Tools/ProtoProxy/Connection.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Tools/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp
index 1f765340f..a9fbe163e 100644
--- a/Tools/ProtoProxy/Connection.cpp
+++ b/Tools/ProtoProxy/Connection.cpp
@@ -190,7 +190,7 @@ struct sChunkMeta
cConnection::cConnection(SOCKET a_ClientSocket, cServer & a_Server) :
m_ItemIdx(0),
- m_LogFile(NULL),
+ m_LogFile(nullptr),
m_Server(a_Server),
m_ClientSocket(a_ClientSocket),
m_ServerSocket(-1),
@@ -252,7 +252,7 @@ void cConnection::Run(void)
FD_SET(m_ServerSocket, &ReadFDs);
FD_SET(m_ClientSocket, &ReadFDs);
SOCKET MaxSocket = std::max(m_ServerSocket, m_ClientSocket);
- int res = select(MaxSocket + 1, &ReadFDs, NULL, NULL, NULL);
+ int res = select(MaxSocket + 1, &ReadFDs, nullptr, nullptr, nullptr);
if (res <= 0)
{
printf("select() failed: %d; aborting client", SocketError);
@@ -2571,7 +2571,7 @@ bool cConnection::HandleServerUpdateTileEntity(void)
AString fnam;
Printf(fnam, "%s_tile_%08x.nbt", m_LogNameBase.c_str(), m_ItemIdx++);
FILE * f = fopen(fnam.c_str(), "wb");
- if (f != NULL)
+ if (f != nullptr)
{
fwrite(Data.data(), 1, Data.size(), f);
fclose(f);
@@ -2730,7 +2730,7 @@ bool cConnection::ParseSlot(cByteBuffer & a_Buffer, AString & a_ItemDesc)
AString fnam;
Printf(fnam, "%s_item_%08x.nbt", m_LogNameBase.c_str(), m_ItemIdx++);
FILE * f = fopen(fnam.c_str(), "wb");
- if (f != NULL)
+ if (f != nullptr)
{
fwrite(Metadata.data(), 1, Metadata.size(), f);
fclose(f);