[Scummvm-git-logs] scummvm master -> f2e03d2c07bab985d941ffc5d681a5b172fa8888

digitall dgturner at iee.org
Mon Jan 16 13:43:10 CET 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f2e03d2c07 CLOUD: Fix Various Compiler Warnings By Adding Casts.


Commit: f2e03d2c07bab985d941ffc5d681a5b172fa8888
    https://github.com/scummvm/scummvm/commit/f2e03d2c07bab985d941ffc5d681a5b172fa8888
Author: D G Turner (digitall at scummvm.org)
Date: 2017-01-16T12:49:40Z

Commit Message:
CLOUD: Fix Various Compiler Warnings By Adding Casts.

Changed paths:
    backends/networking/sdl_net/client.cpp
    backends/networking/sdl_net/getclienthandler.cpp
    backends/networking/sdl_net/handlers/filespagehandler.cpp


diff --git a/backends/networking/sdl_net/client.cpp b/backends/networking/sdl_net/client.cpp
index fbb5fad..0ad366d 100644
--- a/backends/networking/sdl_net/client.cpp
+++ b/backends/networking/sdl_net/client.cpp
@@ -84,7 +84,7 @@ bool Client::readMoreIfNeeded() {
 		return false;
 	}
 
-	if (_stream->write(_buffer, bytes) != bytes) {
+	if (_stream->write(_buffer, bytes) != (uint32)bytes) {
 		warning("Client::readMoreIfNeeded: failed to write() into MemoryReadWriteStream");
 		close();
 		return false;
diff --git a/backends/networking/sdl_net/getclienthandler.cpp b/backends/networking/sdl_net/getclienthandler.cpp
index b22c80c..ef085c6 100644
--- a/backends/networking/sdl_net/getclienthandler.cpp
+++ b/backends/networking/sdl_net/getclienthandler.cpp
@@ -145,7 +145,7 @@ void GetClientHandler::handle(Client *client) {
 	}
 
 	if (readBytes != 0)
-		if (client->send(_buffer, readBytes) != readBytes) {
+		if (client->send(_buffer, readBytes) != (int)readBytes) {
 			warning("GetClientHandler: unable to send all bytes to the client");
 			client->close();
 			return;
diff --git a/backends/networking/sdl_net/handlers/filespagehandler.cpp b/backends/networking/sdl_net/handlers/filespagehandler.cpp
index 01b40c3..dea7367 100644
--- a/backends/networking/sdl_net/handlers/filespagehandler.cpp
+++ b/backends/networking/sdl_net/handlers/filespagehandler.cpp
@@ -56,7 +56,7 @@ Common::String encodeHtmlEntities(Common::String s) {
 			result += ">";
 		else if (s[i] == '&')
 			result += "&";
-		else if (s[i] > 0x7F)
+		else if (s[i] > (char)0x7F)
 			result += Common::String::format("&#%d;", (int)s[i]);
 		else result += s[i];
 	return result;





More information about the Scummvm-git-logs mailing list