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

sev- sev at scummvm.org
Fri Aug 11 22:06:01 CEST 2017


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

Summary:
1d086b9f20 BACKENDS: SURFACESDL: Add missing break statement
addcdd5ae8 NETWORKING: Fix data type cast in comparison. char is usually signed
bb58647588 NETWORKING: Fix warning


Commit: 1d086b9f20991ad9b87daa1cabc4610f9d611a5a
    https://github.com/scummvm/scummvm/commit/1d086b9f20991ad9b87daa1cabc4610f9d611a5a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-11T21:59:59+02:00

Commit Message:
BACKENDS: SURFACESDL: Add missing break statement

Changed paths:
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp


diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 2e658bc..180ab42 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -2634,6 +2634,8 @@ bool SurfaceSdlGraphicsManager::notifyEvent(const Common::Event &event) {
 				return true;
 		}
 
+		break;
+
 	case Common::EVENT_KEYUP:
 		return isScalerHotkey(event);
 


Commit: addcdd5ae8bf18f897dd80b9e457383f00b2a290
    https://github.com/scummvm/scummvm/commit/addcdd5ae8bf18f897dd80b9e457383f00b2a290
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-11T22:00:15+02:00

Commit Message:
NETWORKING: Fix data type cast in comparison. char is usually signed

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


diff --git a/backends/networking/sdl_net/handlers/filespagehandler.cpp b/backends/networking/sdl_net/handlers/filespagehandler.cpp
index dea7367..22afa83 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] > (char)0x7F)
+		else if (s[i] > (byte)0x7F)
 			result += Common::String::format("&#%d;", (int)s[i]);
 		else result += s[i];
 	return result;


Commit: bb5864758817548268b9c48ce62e243100384b71
    https://github.com/scummvm/scummvm/commit/bb5864758817548268b9c48ce62e243100384b71
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-11T22:05:35+02:00

Commit Message:
NETWORKING: Fix warning

Changed paths:
    backends/networking/sdl_net/localwebserver.cpp


diff --git a/backends/networking/sdl_net/localwebserver.cpp b/backends/networking/sdl_net/localwebserver.cpp
index 81362ea..7ef1565 100644
--- a/backends/networking/sdl_net/localwebserver.cpp
+++ b/backends/networking/sdl_net/localwebserver.cpp
@@ -325,7 +325,7 @@ void LocalWebserver::resolveAddress(void *ipAddress) {
 		    warning("LocalWebserver: ioctl SIOCGIFCONF failed: %s (%d)", strerror(errno), errno);
 		} else {
 			struct ifreq *i;
-			for (size_t index = 0; index < ifc.ifc_len; index += _SIZEOF_ADDR_IFREQ(*i)) {
+			for (size_t index = 0; index < (size_t)ifc.ifc_len; index += _SIZEOF_ADDR_IFREQ(*i)) {
 				i = (struct ifreq *)(buffer + index);
 
 				Common::String addr;





More information about the Scummvm-git-logs mailing list