Warnings

src/ByteBuffer.cpp

@@ -171,7 +171,7 @@ cByteBuffer::~cByteBuffer()
 
 
 
-bool cByteBuffer::Write(const char * a_Bytes, int a_Count)
+bool cByteBuffer::Write(const char * a_Bytes, size_t a_Count)
 {
 	CHECK_THREAD;
 	CheckValid();
@@ -263,7 +263,7 @@ int cByteBuffer::GetReadableSpace(void) const
 
 
 
-bool cByteBuffer::CanReadBytes(int a_Count) const
+bool cByteBuffer::CanReadBytes(size_t a_Count) const
 {
 	CHECK_THREAD;
 	CheckValid();
@@ -274,7 +274,7 @@ bool cByteBuffer::CanReadBytes(int a_Count) const
 
 
 
-bool cByteBuffer::CanWriteBytes(int a_Count) const
+bool cByteBuffer::CanWriteBytes(size_t a_Count) const
 {
 	CHECK_THREAD;
 	CheckValid();
@@ -767,7 +767,7 @@ bool cByteBuffer::ReadUTF16String(AString & a_String, int a_NumChars)
 
 
 
-bool cByteBuffer::SkipRead(int a_Count)
+bool cByteBuffer::SkipRead(size_t a_Count)
 {
 	CHECK_THREAD;
 	CheckValid();
@@ -860,7 +860,7 @@ void cByteBuffer::ReadAgain(AString & a_Out)
 
 
 
-void cByteBuffer::AdvanceReadPos(int a_Count)
+void cByteBuffer::AdvanceReadPos(size_t a_Count)
 {
 	CHECK_THREAD;
 	CheckValid();

src/ByteBuffer.h

@@ -31,7 +31,7 @@ public:
 	~cByteBuffer();
 	
 	/// Writes the bytes specified to the ringbuffer. Returns true if successful, false if not
-	bool Write(const char * a_Bytes, int a_Count);
+	bool Write(const char * a_Bytes, size_t a_Count);
 	
 	/// Returns the number of bytes that can be successfully written to the ringbuffer
 	int  GetFreeSpace(void) const;
@@ -46,10 +46,10 @@ public:
 	int  GetDataStart(void) const { return m_DataStart; }
 	
 	/// Returns true if the specified amount of bytes are available for reading
-	bool CanReadBytes(int a_Count) const;
+	bool CanReadBytes(size_t a_Count) const;
 
 	/// Returns true if the specified amount of bytes are available for writing
-	bool CanWriteBytes(int a_Count) const;
+	bool CanWriteBytes(size_t a_Count) const;
 
 	// Read the specified datatype and advance the read pointer; return true if successfully read:
 	bool ReadChar           (char & a_Value);
@@ -92,19 +92,19 @@ public:
 	bool WriteLEInt          (int a_Value);
 	
 	/// Reads a_Count bytes into a_Buffer; returns true if successful
-	bool ReadBuf(void * a_Buffer, int a_Count);
+	bool ReadBuf(void * a_Buffer, size_t a_Count);
 	
 	/// Writes a_Count bytes into a_Buffer; returns true if successful
-	bool WriteBuf(const void * a_Buffer, int a_Count);
+	bool WriteBuf(const void * a_Buffer, size_t a_Count);
 	
 	/// Reads a_Count bytes into a_String; returns true if successful
-	bool ReadString(AString & a_String, int a_Count);
+	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, int a_NumChars);
 	
 	/// Skips reading by a_Count bytes; returns false if not enough bytes in the ringbuffer
-	bool SkipRead(int a_Count);
+	bool SkipRead(size_t a_Count);
 	
 	/// Reads all available data into a_Data
 	void ReadAll(AString & a_Data);
@@ -126,18 +126,18 @@ public:
 
 protected:
 	char * m_Buffer;
-	int    m_BufferSize;  // Total size of the ringbuffer
+	size_t m_BufferSize;  // Total size of the ringbuffer
 	
 	#ifdef _DEBUG
 	volatile unsigned long m_ThreadID;  // Thread that is currently accessing the object, checked via cSingleThreadAccessChecker
 	#endif  // _DEBUG
 	
-	int    m_DataStart;  // Where the data starts in the ringbuffer
+	size_t m_DataStart;  // Where the data starts in the ringbuffer
-	int    m_WritePos;   // Where the data ends in the ringbuffer
+	size_t m_WritePos;   // Where the data ends in the ringbuffer
-	int    m_ReadPos;    // Where the next read will start in the ringbuffer
+	size_t m_ReadPos;    // Where the next read will start in the ringbuffer
 	
 	/// Advances the m_ReadPos by a_Count bytes
-	void AdvanceReadPos(int a_Count);
+	void AdvanceReadPos(size_t a_Count);
 } ;
 
 

src/Protocol/Protocol.h

@@ -52,7 +52,7 @@ public:
 	virtual ~cProtocol() {}
 	
 	/// Called when client sends some data
-	virtual void DataReceived(const char * a_Data, int a_Size) = 0;
+	virtual void DataReceived(const char * a_Data, size_t a_Size) = 0;
 	
 	// Sending stuff to clients (alphabetically sorted):
 	virtual void SendAttachEntity        (const cEntity & a_Entity, const cEntity * a_Vehicle) = 0;

src/Protocol/Protocol125.cpp

@@ -1186,7 +1186,7 @@ void cProtocol125::SendData(const char * a_Data, int a_Size)
 
 
 
-void cProtocol125::DataReceived(const char * a_Data, int a_Size)
+void cProtocol125::DataReceived(const char * a_Data, size_t a_Size)
 {
 	if (!m_ReceivedData.Write(a_Data, a_Size))
 	{

src/Protocol/Protocol125.h

@@ -24,7 +24,7 @@ public:
 	cProtocol125(cClientHandle * a_Client);
 	
 	/// Called when client sends some data:
-	virtual void DataReceived(const char * a_Data, int a_Size) override;
+	virtual void DataReceived(const char * a_Data, size_t a_Size) override;
 	
 	/// Sending stuff to clients (alphabetically sorted):
 	virtual void SendAttachEntity        (const cEntity & a_Entity, const cEntity * a_Vehicle) override;
@@ -57,9 +57,17 @@ public:
 	virtual void SendLogin               (const cPlayer & a_Player, const cWorld & a_World) override;
 	virtual void SendMapColumn           (int a_ID, int a_X, int a_Y, const Byte * a_Colors, unsigned int a_Length) override;
 	virtual void SendMapDecorators       (int a_ID, const cMapDecoratorList & a_Decorators) override;
-	virtual void SendMapInfo             (int a_ID, unsigned int a_Scale) override {} // This protocol doesn't support such message
+	virtual void SendMapInfo             (int a_ID, unsigned int a_Scale) override 
+	{
+		// This protocol doesn't support such message
+		UNUSED(a_ID);
+		UNUSED(a_Scale);
+	} 
 	virtual void SendParticleEffect      (const AString & a_ParticleName, float a_SrcX, float a_SrcY, float a_SrcZ, float a_OffsetX, float a_OffsetY, float a_OffsetZ, float a_ParticleData, int a_ParticleAmmount) override;
-	virtual void SendPaintingSpawn       (const cPainting & a_Painting) override {};
+	virtual void SendPaintingSpawn       (const cPainting & a_Painting) override 
+	{
+		UNUSED(a_Painting);
+	};
 	virtual void SendPickupSpawn         (const cPickup & a_Pickup) override;
 	virtual void SendPlayerAbilities     (void) override {}  // This protocol doesn't support such message
 	virtual void SendEntityAnimation     (const cEntity & a_Entity, char a_Animation) override;
@@ -73,7 +81,12 @@ public:
 	virtual void SendRespawn             (void) override;
 	virtual void SendExperience          (void) override;
 	virtual void SendExperienceOrb       (const cExpOrb &  a_ExpOrb) override;
-	virtual void SendScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode)                            override {} // This protocol doesn't support such message
+	virtual void SendScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode)                            override 
+	{
+		UNUSED(a_Name);
+		UNUSED(a_DisplayName);
+		UNUSED(a_Mode);
+	} // This protocol doesn't support such message
 	virtual void SendScoreUpdate         (const AString & a_Objective, const AString & a_Player, cObjective::Score a_Score, Byte a_Mode) override {} // This protocol doesn't support such message
 	virtual void SendDisplayObjective    (const AString & a_Objective, cScoreboard::eDisplaySlot a_Display)                              override {} // This protocol doesn't support such message
 	virtual void SendSoundEffect         (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override;  // a_Src coords are Block * 8

src/Protocol/Protocol132.cpp

@@ -108,7 +108,7 @@ cProtocol132::~cProtocol132()
 
 
 
-void cProtocol132::DataReceived(const char * a_Data, int a_Size)
+void cProtocol132::DataReceived(const char * a_Data, size_t a_Size)
 {
 	if (m_IsEncrypted)
 	{

src/Protocol/Protocol132.h

@@ -40,7 +40,7 @@ public:
 	virtual ~cProtocol132();
 
 	/// Called when client sends some data:
-	virtual void DataReceived(const char * a_Data, int a_Size) override;
+	virtual void DataReceived(const char * a_Data, size_t a_Size) override;
 	
 	// Sending commands (alphabetically sorted):
 	virtual void SendBlockAction         (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;

src/Protocol/Protocol17x.cpp

@@ -98,7 +98,7 @@ cProtocol172::cProtocol172(cClientHandle * a_Client, const AString & a_ServerAdd
 
 
 
-void cProtocol172::DataReceived(const char * a_Data, int a_Size)
+void cProtocol172::DataReceived(const char * a_Data, size_t a_Size)
 {
 	if (m_IsEncrypted)
 	{

src/Protocol/Protocol17x.h

@@ -56,7 +56,7 @@ public:
 	cProtocol172(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
 	
 	/** Called when client sends some data: */
-	virtual void DataReceived(const char * a_Data, int a_Size) override;
+	virtual void DataReceived(const char * a_Data, size_t a_Size) override;
 
 	/** Sending stuff to clients (alphabetically sorted): */
 	virtual void SendAttachEntity        (const cEntity & a_Entity, const cEntity * a_Vehicle) override;

src/Protocol/ProtocolRecognizer.cpp

@@ -68,7 +68,7 @@ AString cProtocolRecognizer::GetVersionTextFromInt(int a_ProtocolVersion)
 
 
 
-void cProtocolRecognizer::DataReceived(const char * a_Data, int a_Size)
+void cProtocolRecognizer::DataReceived(const char * a_Data, size_t a_Size)
 {
 	if (m_Protocol == NULL)
 	{

src/Protocol/ProtocolRecognizer.h

@@ -59,7 +59,7 @@ public:
 	static AString GetVersionTextFromInt(int a_ProtocolVersion);
 	
 	/// Called when client sends some data:
-	virtual void DataReceived(const char * a_Data, int a_Size) override;
+	virtual void DataReceived(const char * a_Data, size_t a_Size) override;
 	
 	/// Sending stuff to clients (alphabetically sorted):
 	virtual void SendAttachEntity        (const cEntity & a_Entity, const cEntity * a_Vehicle) override;