[Scummvm-git-logs] scummvm master -> 34d01af00482cde23de2913e383c409fd82d96c7

[dreammaster]

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:
34d01af004 GLK: Fix Buildbot identified warnings


Commit: 34d01af00482cde23de2913e383c409fd82d96c7
    https://github.com/scummvm/scummvm/commit/34d01af00482cde23de2913e383c409fd82d96c7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-12-08T19:45:44-08:00

Commit Message:
GLK: Fix Buildbot identified warnings

Changed paths:
    engines/glk/frotz/detection.cpp
    engines/glk/glk_api.cpp
    engines/glk/glulxe/detection.cpp
    engines/glk/tads/detection.cpp


diff --git a/engines/glk/frotz/detection.cpp b/engines/glk/frotz/detection.cpp
index 7afeec2..c0b7149 100644
--- a/engines/glk/frotz/detection.cpp
+++ b/engines/glk/frotz/detection.cpp
@@ -98,7 +98,7 @@ bool FrotzMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &g
 				if (dot)
 					fname = Common::String(fname.c_str(), dot);
 
-				debug("ENTRY0(\"%s\", \"%s-%s\", \"%s\", %lu),",
+				debug("ENTRY0(\"%s\", \"%s-%s\", \"%s\", %u),",
 					folderName.c_str(), fname.c_str(), serial, md5.c_str(), filesize);
 			}
 			const PlainGameDescriptor &desc = FROTZ_GAME_LIST[0];
diff --git a/engines/glk/glk_api.cpp b/engines/glk/glk_api.cpp
index c24d452..08dce8c 100644
--- a/engines/glk/glk_api.cpp
+++ b/engines/glk/glk_api.cpp
@@ -1006,7 +1006,7 @@ glui32 GlkAPI::glk_schannel_play(schanid_t chan, glui32 snd) {
 
 glui32 GlkAPI::glk_schannel_play_ext(schanid_t chan, glui32 snd, glui32 repeats, glui32 notify) {
 	if (chan) {
-		chan->play(snd, repeats, notify);
+		return chan->play(snd, repeats, notify);
 	} else {
 		warning("schannel_play_ext: invalid ref");
 		return 0;
diff --git a/engines/glk/glulxe/detection.cpp b/engines/glk/glulxe/detection.cpp
index 0e1ec1f..9314470 100644
--- a/engines/glk/glulxe/detection.cpp
+++ b/engines/glk/glulxe/detection.cpp
@@ -89,8 +89,7 @@ bool GlulxeMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &
 				if (dot)
 					fname = Common::String(fname.c_str(), dot);
 
-				debug("ENTRY0(\"%s\", \"%s\", %lu),",
-					fname.c_str(), md5.c_str(), filesize);
+				debug("ENTRY0(\"%s\", \"%s\", %u),", fname.c_str(), md5.c_str(), filesize);
 			}
 			const PlainGameDescriptor &desc = GLULXE_GAME_LIST[0];
 			gd = DetectedGame(desc.gameId, desc.description, Common::UNK_LANG, Common::kPlatformUnknown);
diff --git a/engines/glk/tads/detection.cpp b/engines/glk/tads/detection.cpp
index 5f0bfea..d33cb5d 100644
--- a/engines/glk/tads/detection.cpp
+++ b/engines/glk/tads/detection.cpp
@@ -79,8 +79,7 @@ bool TADSMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &ga
 				if (dot)
 					fname = Common::String(fname.c_str(), dot);
 
-				debug("ENTRY0(\"%s\", \"%s\", %lu),",
-					fname.c_str(), md5.c_str(), filesize);
+				debug("ENTRY0(\"%s\", \"%s\", %u),", fname.c_str(), md5.c_str(), filesize);
 			}
 			const TADSDescriptor &desc = TADS_GAME_LIST[0];
 			gd = DetectedGame(desc.gameId, desc.description, Common::UNK_LANG, Common::kPlatformUnknown);