Michael Stefaniuc : Don't check pointers for NULL before RtlFreeHeap. It is redundant.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 7a8818e7174529be487e6c0a183c54a905f626d4
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=7a8818e7174529be487e6c0a...

Author: Michael Stefaniuc 
Date:   Mon May  1 22:44:43 2006 +0200

Don't check pointers for NULL before RtlFreeHeap. It is redundant.

---

dlls/kernel/sync.c       |    7 ++-----
 dlls/ntdll/debugbuffer.c |    6 +++---
 dlls/ntdll/reg.c         |    3 +--
 dlls/ntdll/thread.c      |    2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c
index cec44f5..8c43e53 100644
--- a/dlls/kernel/sync.c
+++ b/dlls/kernel/sync.c
@@ -386,11 +386,8 @@ void WINAPI MakeCriticalSectionGlobal( C
     HANDLE sem = crit->LockSemaphore;
     if (!sem) NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 );
     crit->LockSemaphore = ConvertToGlobalHandle( sem );
-    if (crit->DebugInfo)
-    {
-        RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo );
-        crit->DebugInfo = NULL;
-    }
+    RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo );
+    crit->DebugInfo = NULL;
 }

diff --git a/dlls/ntdll/debugbuffer.c b/dlls/ntdll/debugbuffer.c
index 600c7fa..424b112 100644
--- a/dlls/ntdll/debugbuffer.c
+++ b/dlls/ntdll/debugbuffer.c
@@ -107,9 +107,9 @@ NTSTATUS WINAPI RtlDestroyQueryDebugBuff
    NTSTATUS nts = STATUS_SUCCESS;
    FIXME("(%p): stub\n", iBuf);
    if (NULL != iBuf) {
-     if (NULL != iBuf->ModuleInformation) RtlFreeHeap(GetProcessHeap(), 0, iBuf->ModuleInformation);
-     if (NULL != iBuf->HeapInformation) RtlFreeHeap(GetProcessHeap(), 0, iBuf->HeapInformation);
-     if (NULL != iBuf->LockInformation) RtlFreeHeap(GetProcessHeap(), 0, iBuf->LockInformation);
+     RtlFreeHeap(GetProcessHeap(), 0, iBuf->ModuleInformation);
+     RtlFreeHeap(GetProcessHeap(), 0, iBuf->HeapInformation);
+     RtlFreeHeap(GetProcessHeap(), 0, iBuf->LockInformation);
      RtlFreeHeap(GetProcessHeap(), 0, iBuf);
    }
    return nts;
diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index aa5a6ab..e3266c5 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -345,8 +345,7 @@ NTSTATUS WINAPI RtlpNtEnumerateSubKey( H
     }
   }

-  if (info)
-    RtlFreeHeap( GetProcessHeap(), 0, info );
+  RtlFreeHeap( GetProcessHeap(), 0, info );
   return ret;
 }

diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 67e6930..efe2a46 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -470,7 +470,7 @@ error:
         SIZE_T size = 0;
         NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE );
     }
-    if (info) RtlFreeHeap( GetProcessHeap(), 0, info );
+    RtlFreeHeap( GetProcessHeap(), 0, info );
     if (handle) NtClose( handle );
     close( request_pipe[1] );
     return status;