aboutsummaryrefslogtreecommitdiff
path: root/backends/platform
diff options
context:
space:
mode:
authorTorbjörn Andersson2010-01-28 05:20:52 +0000
committerTorbjörn Andersson2010-01-28 05:20:52 +0000
commit9a85b1284b088b6a07afcc848f66be361025ed8d (patch)
treee9b9f54055834cdcbc624e101f330c1ee19acad7 /backends/platform
parent33780aa3a5c82b9af32712b667bf39e299262636 (diff)
downloadscummvm-rg350-9a85b1284b088b6a07afcc848f66be361025ed8d.tar.gz
scummvm-rg350-9a85b1284b088b6a07afcc848f66be361025ed8d.tar.bz2
scummvm-rg350-9a85b1284b088b6a07afcc848f66be361025ed8d.zip
Silenced some more cppcheck style warnings.
svn-id: r47628
Diffstat (limited to 'backends/platform')
-rw-r--r--backends/platform/dc/display.cpp3
-rw-r--r--backends/platform/dc/vmsave.cpp3
-rw-r--r--backends/platform/ps2/irxboot.cpp6
3 files changed, 4 insertions, 8 deletions
diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp
index e89393b72c..35d181e21f 100644
--- a/backends/platform/dc/display.cpp
+++ b/backends/platform/dc/display.cpp
@@ -320,8 +320,7 @@ void OSystem_Dreamcast::setMouseCursor(const byte *buf, uint w, uint h,
break;
_mouseFormat = i;
- if (_ms_buf)
- free(_ms_buf);
+ free(_ms_buf);
if (_mouseFormat != 0)
w <<= 1;
diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp
index dbbe49fc74..5068370ce6 100644
--- a/backends/platform/dc/vmsave.cpp
+++ b/backends/platform/dc/vmsave.cpp
@@ -278,8 +278,7 @@ public:
~InVMSave()
{
- if (buffer != NULL)
- delete[] buffer;
+ delete[] buffer;
}
bool eos() const { return _eos; }
diff --git a/backends/platform/ps2/irxboot.cpp b/backends/platform/ps2/irxboot.cpp
index 15cb816c31..5ab7823e63 100644
--- a/backends/platform/ps2/irxboot.cpp
+++ b/backends/platform/ps2/irxboot.cpp
@@ -181,10 +181,8 @@ int loadIrxModules(int device, const char *irxPath, IrxReference **modules) {
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) {