diff options
author | madmaxoft <github@xoft.cz> | 2014-04-04 13:29:48 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-04-04 13:29:48 +0200 |
commit | d77ca77086ddc158355d7d1c4b37ae19eedfe5f7 (patch) | |
tree | 5bf093d28fb0be55e4c1447161d3275cc55bb5ff /src/Protocol/Protocol17x.cpp | |
parent | Merge branch 'master' into HTTPSizeT (diff) | |
parent | Explicit change record size. (diff) | |
download | cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.gz cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.bz2 cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.lz cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.xz cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.zst cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.zip |
Diffstat (limited to 'src/Protocol/Protocol17x.cpp')
-rw-r--r-- | src/Protocol/Protocol17x.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp index c678fc9a0..a4319df37 100644 --- a/src/Protocol/Protocol17x.cpp +++ b/src/Protocol/Protocol17x.cpp @@ -1236,7 +1236,7 @@ void cProtocol172::SendWindowProperty(const cWindow & a_Window, short a_Property -void cProtocol172::AddReceivedData(const char * a_Data, int a_Size) +void cProtocol172::AddReceivedData(const char * a_Data, size_t a_Size) { // Write the incoming data into the comm log file: if (g_ShouldLogCommIn) @@ -1258,7 +1258,7 @@ void cProtocol172::AddReceivedData(const char * a_Data, int a_Size) AString Hex; CreateHexDump(Hex, a_Data, a_Size, 16); m_CommLogFile.Printf("Incoming data: %d (0x%x) bytes: \n%s\n", - a_Size, a_Size, Hex.c_str() + (unsigned)a_Size, (unsigned)a_Size, Hex.c_str() ); m_CommLogFile.Flush(); } @@ -1988,14 +1988,14 @@ void cProtocol172::WritePacket(cByteBuffer & a_Packet) -void cProtocol172::SendData(const char * a_Data, int a_Size) +void cProtocol172::SendData(const char * a_Data, size_t a_Size) { if (m_IsEncrypted) { Byte Encrypted[8192]; // Larger buffer, we may be sending lots of data (chunks) while (a_Size > 0) { - size_t NumBytes = ((size_t)a_Size > sizeof(Encrypted)) ? sizeof(Encrypted) : (size_t)a_Size; + size_t NumBytes = (a_Size > sizeof(Encrypted)) ? sizeof(Encrypted) : a_Size; m_Encryptor.ProcessData(Encrypted, (Byte *)a_Data, NumBytes); m_Client->SendData((const char *)Encrypted, NumBytes); a_Size -= NumBytes; |