summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-12-22 15:19:29 +0100
committermadmaxoft <github@xoft.cz>2013-12-31 09:16:41 +0100
commitc83dfdb66e096f16805d0a842e0492645dc086c2 (patch)
tree25fd79bd1e5a767452a15847a225c2bc124a9e67 /src
parentfixed ClientHandle warnings (diff)
downloadcuberite-c83dfdb66e096f16805d0a842e0492645dc086c2.tar
cuberite-c83dfdb66e096f16805d0a842e0492645dc086c2.tar.gz
cuberite-c83dfdb66e096f16805d0a842e0492645dc086c2.tar.bz2
cuberite-c83dfdb66e096f16805d0a842e0492645dc086c2.tar.lz
cuberite-c83dfdb66e096f16805d0a842e0492645dc086c2.tar.xz
cuberite-c83dfdb66e096f16805d0a842e0492645dc086c2.tar.zst
cuberite-c83dfdb66e096f16805d0a842e0492645dc086c2.zip
Diffstat (limited to 'src')
-rw-r--r--src/ByteBuffer.cpp6
-rw-r--r--src/ByteBuffer.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ByteBuffer.cpp b/src/ByteBuffer.cpp
index 64c03d0d3..510018005 100644
--- a/src/ByteBuffer.cpp
+++ b/src/ByteBuffer.cpp
@@ -773,7 +773,7 @@ void cByteBuffer::ReadAll(AString & a_Data)
-bool cByteBuffer::ReadToByteBuffer(cByteBuffer & a_Dst, int a_NumBytes)
+bool cByteBuffer::ReadToByteBuffer(cByteBuffer & a_Dst, size_t a_NumBytes)
{
if (!a_Dst.CanWriteBytes(a_NumBytes) || !CanReadBytes(a_NumBytes))
{
@@ -781,9 +781,9 @@ bool cByteBuffer::ReadToByteBuffer(cByteBuffer & a_Dst, int a_NumBytes)
return false;
}
char buf[1024];
- while (a_NumBytes > 0)
+ while (a_NumBytes > static_cast<size_t>(0))
{
- int num = (a_NumBytes > sizeof(buf)) ? sizeof(buf) : a_NumBytes;
+ size_t num = (a_NumBytes > sizeof(buf)) ? sizeof(buf) : a_NumBytes;
VERIFY(ReadBuf(buf, num));
VERIFY(a_Dst.Write(buf, num));
a_NumBytes -= num;
diff --git a/src/ByteBuffer.h b/src/ByteBuffer.h
index 06c846fa9..cbce119b1 100644
--- a/src/ByteBuffer.h
+++ b/src/ByteBuffer.h
@@ -110,7 +110,7 @@ public:
void ReadAll(AString & a_Data);
/// Reads the specified number of bytes and writes it into the destinatio bytebuffer. Returns true on success.
- bool ReadToByteBuffer(cByteBuffer & a_Dst, int a_NumBytes);
+ bool ReadToByteBuffer(cByteBuffer & a_Dst, size_t a_NumBytes);
/// Removes the bytes that have been read from the ringbuffer
void CommitRead(void);