summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortycho <work.tycho@gmail.com>2015-09-29 16:51:43 +0200
committerMattes D <github@xoft.cz>2015-10-02 17:26:53 +0200
commit899955f9e301401de6a26b3de038dfa75279406c (patch)
tree622933c33fadd152f71ae360477a71dae0a3bf51
parentMerge pull request #2511 from cuberite/BottomLayerSpawn (diff)
downloadcuberite-899955f9e301401de6a26b3de038dfa75279406c.tar
cuberite-899955f9e301401de6a26b3de038dfa75279406c.tar.gz
cuberite-899955f9e301401de6a26b3de038dfa75279406c.tar.bz2
cuberite-899955f9e301401de6a26b3de038dfa75279406c.tar.lz
cuberite-899955f9e301401de6a26b3de038dfa75279406c.tar.xz
cuberite-899955f9e301401de6a26b3de038dfa75279406c.tar.zst
cuberite-899955f9e301401de6a26b3de038dfa75279406c.zip
-rw-r--r--src/ByteBuffer.cpp34
-rw-r--r--src/ByteBuffer.h4
2 files changed, 0 insertions, 38 deletions
diff --git a/src/ByteBuffer.cpp b/src/ByteBuffer.cpp
index 7088b55f3..7999226e8 100644
--- a/src/ByteBuffer.cpp
+++ b/src/ByteBuffer.cpp
@@ -473,22 +473,6 @@ bool cByteBuffer::ReadBool(bool & a_Value)
-bool cByteBuffer::ReadBEUTF16String16(AString & a_Value)
-{
- CHECK_THREAD
- CheckValid();
- UInt16 Length;
- if (!ReadBEUInt16(Length))
- {
- return false;
- }
- return ReadUTF16String(a_Value, Length);
-}
-
-
-
-
-
bool cByteBuffer::ReadVarInt32(UInt32 & a_Value)
{
CHECK_THREAD
@@ -929,24 +913,6 @@ bool cByteBuffer::ReadString(AString & a_String, size_t a_Count)
-bool cByteBuffer::ReadUTF16String(AString & a_String, size_t a_NumChars)
-{
- // Reads 2 * a_NumChars bytes and interprets it as a UTF16 string, converting it into UTF8 string a_String
- CHECK_THREAD
- CheckValid();
- AString RawData;
- if (!ReadString(RawData, a_NumChars * 2))
- {
- return false;
- }
- RawBEToUTF8(RawData.data(), a_NumChars, a_String);
- return true;
-}
-
-
-
-
-
bool cByteBuffer::SkipRead(size_t a_Count)
{
CHECK_THREAD
diff --git a/src/ByteBuffer.h b/src/ByteBuffer.h
index 0a4935327..cec85a404 100644
--- a/src/ByteBuffer.h
+++ b/src/ByteBuffer.h
@@ -63,7 +63,6 @@ public:
bool ReadBEFloat (float & a_Value);
bool ReadBEDouble (double & a_Value);
bool ReadBool (bool & a_Value);
- bool ReadBEUTF16String16(AString & a_Value); // string length as BE short, then string as UTF-16BE
bool ReadVarInt32 (UInt32 & a_Value);
bool ReadVarInt64 (UInt64 & a_Value);
bool ReadVarUTF8String (AString & a_Value); // string length as VarInt, then string as UTF-8
@@ -109,9 +108,6 @@ public:
/** Reads a_Count bytes into a_String; returns true if successful */
bool ReadString(AString & a_String, size_t a_Count);
- /** Reads 2 * a_NumChars bytes and interprets it as a UTF16-BE string, converting it into UTF8 string a_String */
- bool ReadUTF16String(AString & a_String, size_t a_NumChars);
-
/** Skips reading by a_Count bytes; returns false if not enough bytes in the ringbuffer */
bool SkipRead(size_t a_Count);