commit 502bfaf2bccfac0826a3802a5e95bafaf976d981
author Gustavo F. Padovan <gustavo@padovan.org> Sat Jun 05 07:14:28 2010 -0300
committer Johan Hedberg <johan.hedberg@nokia.com> Tue Jun 08 15:57:22 2010 +0800
tree d29d891bae430a1fa87b1be334c25d830737fac8
parent e272c8c69b748abb0a58f57e7c13c9a35b5eb0c3

sbc: Fix redundant null check on calling free()

Issues found by smatch static check: http://smatch.sourceforge.net/

sbc/sbc.c

diff --git a/sbc/sbc.c b/sbc/sbc.c
index edd152f..86399dd 100644
--- a/sbc/sbc.c
+++ b/sbc/sbc.c
@@ -1138,8 +1138,7 @@
 	if (!sbc)
 		return;
 
-	if (sbc->priv_alloc_base)
-		free(sbc->priv_alloc_base);
+	free(sbc->priv_alloc_base);
 
 	memset(sbc, 0, sizeof(sbc_t));
 }

sbc/sbcdec.c

diff --git a/sbc/sbcdec.c b/sbc/sbcdec.c
index 77b8aed..7008e88 100644
--- a/sbc/sbcdec.c
+++ b/sbc/sbcdec.c
@@ -259,15 +259,13 @@
 			break;
 
 		case 'd':
-			if (output)
-				free(output);
+			free(output);
 			output = strdup(optarg);
 			tofile = 0;
 			break;
 
 		case 'f' :
-			if (output)
-				free(output);
+			free(output);
 			output = strdup(optarg);
 			tofile = 1;
 			break;
@@ -289,8 +287,7 @@
 	for (i = 0; i < argc; i++)
 		decode(argv[i], output ? output : "/dev/dsp", tofile);
 
-	if (output)
-		free(output);
+	free(output);
 
 	return 0;
 }