[Scummvm-cvs-logs] SF.net SVN: scummvm:[52106] scummvm/trunk/engines/gob

[strangerke at users.sourceforge.net]

Revision: 52106
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52106&view=rev
Author:   strangerke
Date:     2010-08-15 23:37:56 +0000 (Sun, 15 Aug 2010)

Log Message:
-----------
Gob - Follow cppcheck advices

Modified Paths:
--------------
    scummvm/trunk/engines/gob/expression.cpp
    scummvm/trunk/engines/gob/util.cpp

Modified: scummvm/trunk/engines/gob/expression.cpp
===================================================================
--- scummvm/trunk/engines/gob/expression.cpp	2010-08-15 19:01:18 UTC (rev 52105)
+++ scummvm/trunk/engines/gob/expression.cpp	2010-08-15 23:37:56 UTC (rev 52106)
@@ -1002,7 +1002,6 @@
 	Stack stack;
 	StackFrame stackFrame(stack);
 	byte operation;
-	bool escape;
 	int16 brackStart;
 	uint32 varBase;
 
@@ -1037,7 +1036,6 @@
 		if ((operation == stopToken) || (operation == OP_OR) ||
 				(operation == OP_AND) || (operation == OP_END_EXPR)) {
 			while (stackFrame.pos >= 2) {
-				escape = false;
 				if ((stackFrame.opers[-2] == OP_BEGIN_EXPR) &&
 						((operation == OP_END_EXPR) || (operation == stopToken))) {
 					stackFrame.opers[-2] = stackFrame.opers[-1];

Modified: scummvm/trunk/engines/gob/util.cpp
===================================================================
--- scummvm/trunk/engines/gob/util.cpp	2010-08-15 19:01:18 UTC (rev 52105)
+++ scummvm/trunk/engines/gob/util.cpp	2010-08-15 23:37:56 UTC (rev 52106)
@@ -435,7 +435,7 @@
 		cutFromStr(str, 0, 1);
 
 	// Trim spaces right
-	while ((strlen(str) > 0) && (str[strlen(str) - 1] == ' '))
+	while ((*str != '\0') && (str[strlen(str) - 1] == ' '))
 		cutFromStr(str, strlen(str) - 1, 1);
 
 	// Merge double spaces


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.