[Scummvm-git-logs] scummvm master -> 63d6c577acce584fc65ab83e80d352731e29dad9

[digitall]

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:
63d6c577ac DIRECTOR: Fix Shadowing And Format Security GCC Compiler Warnings


Commit: 63d6c577acce584fc65ab83e80d352731e29dad9
    https://github.com/scummvm/scummvm/commit/63d6c577acce584fc65ab83e80d352731e29dad9
Author: D G Turner (digitall at scummvm.org)
Date: 2024-05-15T19:26:39+01:00

Commit Message:
DIRECTOR: Fix Shadowing And Format Security GCC Compiler Warnings

Changed paths:
    engines/director/lingo/lingodec/ast.h
    engines/director/lingo/lingodec/context.h
    engines/director/lingo/lingodec/handler.cpp
    engines/director/lingo/lingodec/script.cpp
    engines/director/lingo/lingodec/script.h


diff --git a/engines/director/lingo/lingodec/ast.h b/engines/director/lingo/lingodec/ast.h
index 0c21cd3fa46..b1d7122bd8c 100644
--- a/engines/director/lingo/lingodec/ast.h
+++ b/engines/director/lingo/lingodec/ast.h
@@ -316,12 +316,12 @@ struct MemberExprNode : ExprNode {
 	Common::SharedPtr<Node> memberID;
 	Common::SharedPtr<Node> castID;
 
-	MemberExprNode(Common::String type_, Common::SharedPtr<Node> memberID, Common::SharedPtr<Node> castID)
+	MemberExprNode(Common::String type_, Common::SharedPtr<Node> memberID_, Common::SharedPtr<Node> castID_)
 		: ExprNode(kMemberExprNode), type(type_) {
-		this->memberID = Common::move(memberID);
+		this->memberID = Common::move(memberID_);
 		this->memberID->parent = this;
-		if (castID) {
-			this->castID = Common::move(castID);
+		if (castID_) {
+			this->castID = Common::move(castID_);
 			this->castID->parent = this;
 		}
 	}
@@ -425,8 +425,8 @@ struct RepeatWithToStmtNode : LoopNode {
 	Common::SharedPtr<Node> end;
 	Common::SharedPtr<BlockNode> block;
 
-	RepeatWithToStmtNode(uint32 startIndex_, Common::String v, Common::SharedPtr<Node> s, bool up, Common::SharedPtr<Node> e)
-		: LoopNode(kRepeatWithToStmtNode, startIndex_), up(up) {
+	RepeatWithToStmtNode(uint32 startIndex_, Common::String v, Common::SharedPtr<Node> s, bool up_, Common::SharedPtr<Node> e)
+		: LoopNode(kRepeatWithToStmtNode, startIndex_), up(up_) {
 		varName = v;
 		start = Common::move(s);
 		start->parent = this;
diff --git a/engines/director/lingo/lingodec/context.h b/engines/director/lingo/lingodec/context.h
index 62b0a503013..3a0e4425057 100644
--- a/engines/director/lingo/lingodec/context.h
+++ b/engines/director/lingo/lingodec/context.h
@@ -44,8 +44,8 @@ struct ScriptContext {
 	Common::Array<ScriptContextMapEntry> sectionMap;
 	Common::StableMap<uint32, Script *> scripts;
 
-	ScriptContext(unsigned int version, ChunkResolver *resolver) : version(version),
-																   resolver(resolver),
+	ScriptContext(unsigned int version_, ChunkResolver *resolver_) : version(version_),
+																   resolver(resolver_),
 																   lnam(nullptr) {}
 
 	void read(Common::SeekableReadStream &stream);
diff --git a/engines/director/lingo/lingodec/handler.cpp b/engines/director/lingo/lingodec/handler.cpp
index c90af798062..fba36cb4aa5 100644
--- a/engines/director/lingo/lingodec/handler.cpp
+++ b/engines/director/lingo/lingodec/handler.cpp
@@ -169,7 +169,7 @@ Common::SharedPtr<Node> Handler::readVar(int varType) {
 	case 0x6: // field
 		return Common::SharedPtr<Node>(new MemberExprNode("field", Common::move(id), Common::move(castID)));
 	default:
-		warning(Common::String::format("findVar: unhandled var type %d", varType).c_str());
+		warning("%s", Common::String::format("findVar: unhandled var type %d", varType).c_str());
 		break;
 	}
 	return Common::SharedPtr<Node>(new ErrorNode());
diff --git a/engines/director/lingo/lingodec/script.cpp b/engines/director/lingo/lingodec/script.cpp
index c4c3f8d8b88..59e783090e0 100644
--- a/engines/director/lingo/lingodec/script.cpp
+++ b/engines/director/lingo/lingodec/script.cpp
@@ -17,8 +17,8 @@ namespace LingoDec {
 
 /* Script */
 
-Script::Script(unsigned int version) :
-	version(version),
+Script::Script(unsigned int version_) :
+	version(version_),
 	context(nullptr) {}
 
 Script::~Script() = default;
diff --git a/engines/director/lingo/lingodec/script.h b/engines/director/lingo/lingodec/script.h
index 11173a50a2c..33945ee4c81 100644
--- a/engines/director/lingo/lingodec/script.h
+++ b/engines/director/lingo/lingodec/script.h
@@ -74,7 +74,7 @@ struct Script {
 	unsigned int version;
 	ScriptContext *context;
 
-	Script(unsigned int version);
+	Script(unsigned int version_);
 	~Script();
 	void read(Common::SeekableReadStream &stream);
 	Common::Array<int16> readVarnamesTable(Common::SeekableReadStream &stream, uint16 count, uint32 offset);