[Scummvm-cvs-logs] scummvm master -> 4598b3b2d92a75de5970d31692b0c0da14f0fb46

[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:
4598b3b2d9 SCI: Inhibit spurious GCC warnings in script patching code.


Commit: 4598b3b2d92a75de5970d31692b0c0da14f0fb46
    https://github.com/scummvm/scummvm/commit/4598b3b2d92a75de5970d31692b0c0da14f0fb46
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-18T14:59:49+01:00

Commit Message:
SCI: Inhibit spurious GCC warnings in script patching code.

The two relevant variables upon inspection of the current code should
not be used uninitialized as per the compiler linter warning, but
removing this by adding a zero initialization is simple.
It is also good practice and should prevent future issues if the code
is modified.

Changed paths:
    engines/sci/engine/script_patches.cpp



diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index a405ee5..b4d2451 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2668,8 +2668,8 @@ void ScriptPatcher::initSignature(const SciScriptPatcherEntry *patchTable, bool
 	uint16 curWord;
 	uint16 curCommand;
 	uint32 curValue;
-	byte byte1;
-	byte byte2;
+	byte byte1 = 0;
+	byte byte2 = 0;
 	int patchEntryCount = 0;
 
 	// Count entries and allocate runtime data