[Scummvm-cvs-logs] SF.net SVN: scummvm:[50120] scummvm/trunk

[eriktorbjorn at users.sourceforge.net]

Revision: 50120
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50120&view=rev
Author:   eriktorbjorn
Date:     2010-06-21 19:32:25 +0000 (Mon, 21 Jun 2010)

Log Message:
-----------
Fixed some Cppcheck warnings. (There are plenty left, if anyone's wondering.)

Modified Paths:
--------------
    scummvm/trunk/common/macresman.cpp
    scummvm/trunk/common/translation.cpp
    scummvm/trunk/engines/cruise/decompiler.cpp

Modified: scummvm/trunk/common/macresman.cpp
===================================================================
--- scummvm/trunk/common/macresman.cpp	2010-06-21 19:09:19 UTC (rev 50119)
+++ scummvm/trunk/common/macresman.cpp	2010-06-21 19:32:25 UTC (rev 50120)
@@ -525,12 +525,10 @@
 	int i, b;
 	byte imageByte;
 	byte *iconData;
-	int numBytes;
 	int pixelsPerByte, bpp;
 	int ctSize;
 	byte bitmask;
 	int iconRowBytes, iconBounds[4];
-	int ignored;
 	int iconDataSize;
 
 	dis.readUint16BE(); // type
@@ -616,21 +614,19 @@
 		dis.readUint16BE(); // colorID[c]
 
 		palette[0][c * 4 + 0] = dis.readByte();
-		ignored = dis.readByte();
+		dis.readByte();
 
 		palette[0][c * 4 + 1] = dis.readByte();
-		ignored = dis.readByte();
+		dis.readByte();
 
 		palette[0][c * 4 + 2] = dis.readByte();
-		ignored = dis.readByte();
+		dis.readByte();
 
 		palette[0][c * 4 + 3] = 0;
 	}
 
 	*palSize = ctSize;
 
-	numBytes = (iconBounds[2] - iconBounds[0]) * (iconBounds[3] - iconBounds[1]);
-
 	pixelsPerByte = (iconBounds[2] - iconBounds[0]) / iconRowBytes;
 	bpp           = 8 / pixelsPerByte;
 

Modified: scummvm/trunk/common/translation.cpp
===================================================================
--- scummvm/trunk/common/translation.cpp	2010-06-21 19:09:19 UTC (rev 50119)
+++ scummvm/trunk/common/translation.cpp	2010-06-21 19:32:25 UTC (rev 50120)
@@ -90,8 +90,7 @@
 TranslationManager::~TranslationManager() {
 #ifdef USE_TERMCONV
 	iconv_close(_conversion);
-	if (_convmsg)
-		delete[] _convmsg;
+	delete[] _convmsg;
 #endif // USE_TERMCONV
 }
 

Modified: scummvm/trunk/engines/cruise/decompiler.cpp
===================================================================
--- scummvm/trunk/engines/cruise/decompiler.cpp	2010-06-21 19:09:19 UTC (rev 50119)
+++ scummvm/trunk/engines/cruise/decompiler.cpp	2010-06-21 19:32:25 UTC (rev 50120)
@@ -760,8 +760,6 @@
 		char *var1;
 		char *objIdxStr;
 		char *ovlStr;
-		char varName[256];
-		int i;
 
 		var1 = popDecomp();
 		objIdxStr = popDecomp();


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