From 9a85b1284b088b6a07afcc848f66be361025ed8d Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Thu, 28 Jan 2010 05:20:52 +0000 Subject: Silenced some more cppcheck style warnings. svn-id: r47628 --- backends/platform/dc/display.cpp | 3 +-- backends/platform/dc/vmsave.cpp | 3 +-- backends/platform/ps2/irxboot.cpp | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) (limited to 'backends') 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) { -- cgit v1.2.3