From 72eb9ec9eab5efcb3aa99a962a80423e8c0a3232 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 3 Jan 2010 19:37:43 +0000
Subject: Fixed a bunch of cppcheck warnings. Mostly about checking if a
 pointer is null before freeing it, which isn't necessary.

svn-id: r46941
---
 engines/scumm/smush/smush_player.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'engines/scumm/smush')

diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index bd6d582c99..225d7573bf 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -647,12 +647,8 @@ void SmushPlayer::handleTextResource(uint32 subType, int32 subSize, Common::Seek
 		error("SmushPlayer::handleTextResource. Not handled flags: %d", flags);
 	}
 
-	if (string != NULL) {
-		free (string);
-	}
-	if (string3 != NULL) {
-		free (string3);
-	}
+	free(string);
+	free(string3);
 }
 
 const char *SmushPlayer::getString(int id) {
-- 
cgit v1.2.3