commit a87520036f7b9ca8a7292fc8fc53df1fd4ea6ecb
author Michael Stefaniuc <mstefani@redhat.de> Wed May 10 00:33:53 2006 +0200
committer Alexandre Julliard <julliard@winehq.org> Wed May 10 11:31:41 2006 +0200
tree 76933dad43bc722bda2903d03e0f1197a3caa84f
parent 9d4960bfcb927644503861ae627cb79b9aceb81c

janitorial: Remove redundant NULL pointer checks before HeapFree'ing them.

Some HeapFree's are hidden behind macros. Found by smatch.

dlls/secur32/secur32.c

diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c
index ebe7e2e..664f901 100644
--- a/dlls/secur32/secur32.c
+++ b/dlls/secur32/secur32.c
@@ -666,8 +666,7 @@
     {
         LIST_FOR_EACH_ENTRY(provider, &providerTable->table, SecureProvider, entry)
         {
-            if (provider->moduleName)
-                SECUR32_FREE(provider->moduleName);
+            SECUR32_FREE(provider->moduleName);
             if (provider->lib)
                 FreeLibrary(provider->lib);
         }
@@ -689,7 +688,7 @@
  */
 SECURITY_STATUS WINAPI FreeContextBuffer(PVOID pv)
 {
-    if (pv) SECUR32_FREE(pv);
+    SECUR32_FREE(pv);
 
     return SEC_E_OK;
 }

dlls/secur32/tests/main.c

diff --git a/dlls/secur32/tests/main.c b/dlls/secur32/tests/main.c
index 44d8301..41eb7fa 100644
--- a/dlls/secur32/tests/main.c
+++ b/dlls/secur32/tests/main.c
@@ -162,12 +162,9 @@
 
     if( identity != NULL)
     {
-        if(identity->Domain != 0)
-            HeapFree(GetProcessHeap(), 0, identity->Domain);
-        if(identity->User != 0)
-            HeapFree(GetProcessHeap(), 0, identity->User);
-        if(identity->Password != 0)
-            HeapFree(GetProcessHeap(), 0, identity->Password);
+        HeapFree(GetProcessHeap(), 0, identity->Domain);
+        HeapFree(GetProcessHeap(), 0, identity->User);
+        HeapFree(GetProcessHeap(), 0, identity->Password);
         HeapFree(GetProcessHeap(), 0, identity);
     }       
 

dlls/secur32/thunks.c

diff --git a/dlls/secur32/thunks.c b/dlls/secur32/thunks.c
index 4bcd7bd..c0d1293 100644
--- a/dlls/secur32/thunks.c
+++ b/dlls/secur32/thunks.c
@@ -77,10 +77,8 @@
         ret = AcquireCredentialsHandleA(principal, package, fCredentialsUse,
          pvLogonID, pAuthData, pGetKeyFn, pvGetKeyArgument, phCredential,
          ptsExpiry);
-        if (principal)
-            SECUR32_FREE(principal);
-        if (package)
-            SECUR32_FREE(package);
+        SECUR32_FREE(principal);
+        SECUR32_FREE(package);
     }
     else
         ret = SEC_E_SECPKG_NOT_FOUND;
@@ -262,8 +260,7 @@
                  phCredential, phContext, target, fContextReq, Reserved1,
                  TargetDataRep, pInput, Reserved2, phNewContext, pOutput,
                  pfContextAttr, ptsExpiry);
-                if (target)
-                    SECUR32_FREE(target);
+                SECUR32_FREE(target);
             }
             else
                 ret = SEC_E_UNSUPPORTED_FUNCTION;
@@ -898,7 +895,6 @@
     TRACE("%s %p %p %p\n", debugstr_w(pszPackage), pPackedContext, Token,
      phContext);
     ret = ImportSecurityContextA(package, pPackedContext, Token, phContext);
-    if (package)
-        SECUR32_FREE(package);
+    SECUR32_FREE(package);
     return ret;
 }