Michael Stefaniuc : janitorial: Remove redundant NULL checks before calling HeapFree wrappers.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Oct 16 05:28:36 CDT 2006


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

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Sun Oct 15 01:03:58 2006 +0200

janitorial: Remove redundant NULL checks before calling HeapFree wrappers.

---

 dlls/rpcrt4/rpc_message.c |    6 ++----
 dlls/winedos/module.c     |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c
index fb6187f..0120bf6 100644
--- a/dlls/rpcrt4/rpc_message.c
+++ b/dlls/rpcrt4/rpc_message.c
@@ -595,7 +595,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection 
   status = RPC_S_OK;
 
 fail:
-  if (status != RPC_S_OK && *Header) {
+  if (status != RPC_S_OK) {
     RPCRT4_FreeHeader(*Header);
     *Header = NULL;
   }
@@ -765,9 +765,7 @@ RPC_STATUS WINAPI I_RpcReceive(PRPC_MESS
   status = RPC_S_OK;
 
 fail:
-  if (hdr) {
-    RPCRT4_FreeHeader(hdr);
-  }
+  RPCRT4_FreeHeader(hdr);
   RPCRT4_CloseBinding(bind, conn);
   return status;
 }
diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c
index e00b77e..24d6a73 100644
--- a/dlls/winedos/module.c
+++ b/dlls/winedos/module.c
@@ -273,7 +273,7 @@ static BOOL MZ_DoLoadImage( HANDLE hFile
         env_seg = par_env_seg;
     else
         env_seg=MZ_InitEnvironment(oldenv, filename);
-    if( alloc && oldenv)
+    if (alloc)
         FreeEnvironmentStringsA( oldenv);
 
     /* allocate memory for the executable */




More information about the wine-cvs mailing list