diff options
| author | madmaxoft <github@xoft.cz> | 2014-01-12 10:04:16 +0100 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-01-12 10:04:16 +0100 |
| commit | 180b9b90993870532a8daa2ee6498005b6c3bf49 (patch) | |
| tree | dac846b760b6f5fd294fbd771975dd55b0856c0d /src/ByteBuffer.cpp | |
| parent | Fixed Linux configuration. (diff) | |
| parent | Disabled a useless MSVC warning in Bindings.cpp. (diff) | |
| download | cuberite-180b9b90993870532a8daa2ee6498005b6c3bf49.tar cuberite-180b9b90993870532a8daa2ee6498005b6c3bf49.tar.gz cuberite-180b9b90993870532a8daa2ee6498005b6c3bf49.tar.bz2 cuberite-180b9b90993870532a8daa2ee6498005b6c3bf49.tar.lz cuberite-180b9b90993870532a8daa2ee6498005b6c3bf49.tar.xz cuberite-180b9b90993870532a8daa2ee6498005b6c3bf49.tar.zst cuberite-180b9b90993870532a8daa2ee6498005b6c3bf49.zip | |
Diffstat (limited to 'src/ByteBuffer.cpp')
| -rw-r--r-- | src/ByteBuffer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ByteBuffer.cpp b/src/ByteBuffer.cpp index 64c03d0d3..e06f63a0e 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,10 @@ bool cByteBuffer::ReadToByteBuffer(cByteBuffer & a_Dst, int a_NumBytes) return false; } char buf[1024]; - while (a_NumBytes > 0) + // > 0 without generating warnings about unsigned comparisons where size_t is unsigned + while (a_NumBytes != 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; |