Michael Stefaniuc : winealsa: Do not check for non-NULL before HeapFree' ing a variable as the check is redundant.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 34b0161d02a6e8f115d7c671603e81789d34e801
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=34b0161d02a6e8f115d7c67160...

Author: Michael Stefaniuc <mstefani(a)redhat.de>
Date:   Wed Apr 25 01:13:43 2007 +0200

winealsa: Do not check for non-NULL before HeapFree'ing a variable as the check is redundant.

---

 dlls/winealsa.drv/mixer.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c
index 4a39d2b..84701f6 100644
--- a/dlls/winealsa.drv/mixer.c
+++ b/dlls/winealsa.drv/mixer.c
@@ -505,10 +505,8 @@ static void ALSA_MixerInit(void)
 
         eclose:
         WARN("Error occured initialising mixer: %s\n", snd_strerror(err));
-        if (mixdev[mixnum].lines)
-            HeapFree(GetProcessHeap(), 0, mixdev[mixnum].lines);
-        if (mixdev[mixnum].controls)
-            HeapFree(GetProcessHeap(), 0, mixdev[mixnum].controls);
+        HeapFree(GetProcessHeap(), 0, mixdev[mixnum].lines);
+        HeapFree(GetProcessHeap(), 0, mixdev[mixnum].controls);
         snd_mixer_close(mixdev[mixnum].mix);
     }
     cards = mixnum;
@@ -649,8 +647,7 @@ static DWORD WINAPI ALSA_MixerPollThread(LPVOID lParam)
 
     die:
     TRACE("Shutting down\n");
-    if (pfds)
-        HeapFree(GetProcessHeap(), 0, pfds);
+    HeapFree(GetProcessHeap(), 0, pfds);
 
     y = read(msg_pipe[0], &x, sizeof(x));
     close(msg_pipe[1]);