[Scummvm-cvs-logs] SF.net SVN: scummvm:[47628] scummvm/trunk/backends/platform

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Thu Jan 28 06:20:53 CET 2010


Revision: 47628
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47628&view=rev
Author:   eriktorbjorn
Date:     2010-01-28 05:20:52 +0000 (Thu, 28 Jan 2010)

Log Message:
-----------
Silenced some more cppcheck style warnings.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/dc/display.cpp
    scummvm/trunk/backends/platform/dc/vmsave.cpp
    scummvm/trunk/backends/platform/ps2/irxboot.cpp

Modified: scummvm/trunk/backends/platform/dc/display.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/display.cpp	2010-01-28 02:42:03 UTC (rev 47627)
+++ scummvm/trunk/backends/platform/dc/display.cpp	2010-01-28 05:20:52 UTC (rev 47628)
@@ -320,8 +320,7 @@
 	break;
   _mouseFormat = i;
 
-  if (_ms_buf)
-    free(_ms_buf);
+  free(_ms_buf);
 
   if (_mouseFormat != 0)
     w <<= 1;

Modified: scummvm/trunk/backends/platform/dc/vmsave.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/vmsave.cpp	2010-01-28 02:42:03 UTC (rev 47627)
+++ scummvm/trunk/backends/platform/dc/vmsave.cpp	2010-01-28 05:20:52 UTC (rev 47628)
@@ -278,8 +278,7 @@
 
   ~InVMSave()
   {
-    if (buffer != NULL)
-      delete[] buffer;
+    delete[] buffer;
   }
 
   bool eos() const { return _eos; }

Modified: scummvm/trunk/backends/platform/ps2/irxboot.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/irxboot.cpp	2010-01-28 02:42:03 UTC (rev 47627)
+++ scummvm/trunk/backends/platform/ps2/irxboot.cpp	2010-01-28 05:20:52 UTC (rev 47628)
@@ -181,10 +181,8 @@
 					IrxReference *pos = resModules;
 					while (pos < curModule) {
 						if ((pos->fileRef->flags & TYPEMASK) == (irxFiles[i].flags & TYPEMASK)) {
-							if (pos->path)
-								free(pos->path);
-							if (pos->buffer)
-								free(pos->buffer);
+							free(pos->path);
+							free(pos->buffer);
 
 							IrxReference *copyPos = pos;
 							while (copyPos < curModule) {


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




More information about the Scummvm-git-logs mailing list