[Scummvm-git-logs] scummvm master -> 103d781fe94e3d9e9e784c16a8cf00f0be7631da

[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:
103d781fe9 ULTIMA8: gcc warning fixes


Commit: 103d781fe94e3d9e9e784c16a8cf00f0be7631da
    https://github.com/scummvm/scummvm/commit/103d781fe94e3d9e9e784c16a8cf00f0be7631da
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-23T10:59:17-08:00

Commit Message:
ULTIMA8: gcc warning fixes

Changed paths:
    engines/ultima/ultima8/filesys/file_system.cpp
    engines/ultima/ultima8/kernel/core_app.cpp
    engines/ultima/ultima8/kernel/segmented_pool.cpp


diff --git a/engines/ultima/ultima8/filesys/file_system.cpp b/engines/ultima/ultima8/filesys/file_system.cpp
index 518ad1a..9b4ef96 100644
--- a/engines/ultima/ultima8/filesys/file_system.cpp
+++ b/engines/ultima/ultima8/filesys/file_system.cpp
@@ -209,7 +209,8 @@ bool FileSystem::AddVirtualPath(const string &vpath, const string &realpath, con
 	// Finding Reserved Virtual Path Names
 	// memory path is reserved
 	if (vp == "@memory" || vp.substr(0, 8) == "@memory/") {
-		warning("Error mounting virtual path \"%s\": %s\"@memory\" is a reserved virtual path name", vp.c_str());
+		warning("Error mounting virtual path \"%s\": \"@memory\" is a reserved virtual path name",
+			vp.c_str());
 		return false;
 	}
 
diff --git a/engines/ultima/ultima8/kernel/core_app.cpp b/engines/ultima/ultima8/kernel/core_app.cpp
index 4a634f8..3e54268 100644
--- a/engines/ultima/ultima8/kernel/core_app.cpp
+++ b/engines/ultima/ultima8/kernel/core_app.cpp
@@ -147,7 +147,7 @@ void CoreApp::setupGameList() {
 			_games[game] = info;
 
 			Std::string details = info->getPrintDetails();
-			debugN(MM_INFO, details.c_str());
+			debugN(MM_INFO, "%s", details.c_str());
 		} else {
 			debugN(MM_INFO, "unknown, skipping");
 		}
diff --git a/engines/ultima/ultima8/kernel/segmented_pool.cpp b/engines/ultima/ultima8/kernel/segmented_pool.cpp
index e8fca8d..cc5e1b8 100644
--- a/engines/ultima/ultima8/kernel/segmented_pool.cpp
+++ b/engines/ultima/ultima8/kernel/segmented_pool.cpp
@@ -158,9 +158,9 @@ void SegmentedPool::printInfo() {
 	size_t max, min, total;
 	SegmentedPoolNode *node;
 
-	debug(MM_INFO, "start address 0x%X\tend address 0x%X\tnodeOffset 0x%X",
+	debug(MM_INFO, "start address 0x%p\tend address 0x%p\tnodeOffset 0x%x",
 		_startOfPool, _endOfPool, _nodeOffset);
-	debug(MM_INFO, "_nodeCapacity %d b\n   total _nodes %d\tfree _nodes %d",
+	debug(MM_INFO, "_nodeCapacity %u b\n   total _nodes %u\tfree _nodes %u",
 		_nodeCapacity, _nodes, _freeNodeCount);
 	debug(MM_INFO, "total memory: %d\tfree memory: %d",
 		_nodeCapacity * _nodes, _nodeCapacity * _freeNodeCount);
@@ -179,7 +179,7 @@ void SegmentedPool::printInfo() {
 	}
 
 	if (_nodes > _freeNodeCount) {
-		debug(MM_INFO, "smallest node: %d b\tlargest node: %d b\taverage size: %d b",
+		debug(MM_INFO, "smallest node: %u b\tlargest node: %u b\taverage size: %u b",
 			min, max, total / (_nodes - _freeNodeCount));
 	} else {
 		debug(MM_INFO, "Empty pool!!!");