janitorial: Remove redundant NULL checks before SHFree (1/2)

[James Hawkins]

Hi,

Changelog:
* Remove redundant NULL checks before SHFree (1/2).

 dlls/shell32/brsfolder.c      |    4 +---
 dlls/shell32/changenotify.c   |    4 ++--
 dlls/shell32/cpanelfolder.c   |    3 +--
 dlls/shell32/dataobject.c     |    5 +----
 dlls/shell32/pidl.c           |   13 ++++---------
 dlls/shell32/shell.c          |    8 ++++----
 dlls/shell32/shell32_main.c   |    3 +--
 dlls/shell32/shfldr_desktop.c |    6 ++----
 8 files changed, 16 insertions(+), 30 deletions(-)

-- 
James Hawkins
-------------- next part --------------
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 30ee718..aa53ff0 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -354,9 +354,7 @@ static void FillTreeView( browse_info *i
 done:
 	ReleaseCapture();
 	SetCursor(LoadCursorW(0, (LPWSTR)IDC_ARROW));
-
-	if (pidlTemp)
-	  SHFree(pidlTemp);
+    SHFree(pidlTemp);
 }
 
 static inline BOOL PIDLIsType(LPCITEMIDLIST pidl, PIDLTYPE type)
diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c
index 3f3b612..e257aa2 100644
--- a/dlls/shell32/changenotify.c
+++ b/dlls/shell32/changenotify.c
@@ -402,8 +402,8 @@ void WINAPI SHChangeNotify(LONG wEventId
     /* if we allocated it, free it. The ANSI flag is also set in its Unicode sibling. */
     if ((typeFlag & SHCNF_PATHA) || (typeFlag & SHCNF_PRINTERA))
     {
-        if (Pidls[0]) SHFree((LPITEMIDLIST)Pidls[0]);
-        if (Pidls[1]) SHFree((LPITEMIDLIST)Pidls[1]);
+        SHFree((LPITEMIDLIST)Pidls[0]);
+        SHFree((LPITEMIDLIST)Pidls[1]);
     }
 }
 
diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c
index 7767b8d..7601e8d 100644
--- a/dlls/shell32/cpanelfolder.c
+++ b/dlls/shell32/cpanelfolder.c
@@ -203,8 +203,7 @@ static ULONG WINAPI ISF_ControlPanel_fnR
 
     if (!refCount) {
         TRACE("-- destroying IShellFolder(%p)\n", This);
-        if (This->pidlRoot)
-            SHFree(This->pidlRoot);
+        SHFree(This->pidlRoot);
         LocalFree((HLOCAL) This);
     }
     return refCount;
diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c
index 0dcd9b4..1d9c2c3 100644
--- a/dlls/shell32/dataobject.c
+++ b/dlls/shell32/dataobject.c
@@ -97,10 +97,7 @@ static ULONG WINAPI IEnumFORMATETC_fnRel
 	if (!refCount)
 	{
 	  TRACE(" destroying IEnumFORMATETC(%p)\n",This);
-	  if (This->pFmt)
-	  {
-	    SHFree (This->pFmt);
-	  }
+	  SHFree (This->pFmt);
 	  HeapFree(GetProcessHeap(),0,This);
 	  return 0;
 	}
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index 10d87bb..b5a59af 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -291,11 +291,8 @@ HRESULT WINAPI ILLoadFromStream (IStream
 
     TRACE_(shell)("%p %p\n", pStream ,  ppPidl);
 
-    if (*ppPidl)
-    {
-        SHFree(*ppPidl);
-        *ppPidl = NULL;
-    }
+    SHFree(*ppPidl);
+    *ppPidl = NULL;
 
     IStream_AddRef (pStream);
 
@@ -865,8 +862,7 @@ LPITEMIDLIST WINAPI ILAppend(LPITEMIDLIS
     if (_ILIsDesktop(pidl))
     {
         idlRet = ILClone(item);
-        if (pidl)
-            SHFree (pidl);
+        SHFree (pidl);
         return idlRet;
     }
 
@@ -896,8 +892,7 @@ LPITEMIDLIST WINAPI ILAppend(LPITEMIDLIS
 void WINAPI ILFree(LPITEMIDLIST pidl)
 {
     TRACE("(pidl=%p)\n",pidl);
-    if (pidl)
-        SHFree(pidl);
+    SHFree(pidl);
 }
 
 /*************************************************************************
diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c
index 533ccdb..eaa1974 100644
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -628,10 +628,10 @@ HINSTANCE16 WINAPI ShellExecute16( HWND1
 
     SHELL_execute( &seiW, SHELL_Execute16 );
 
-    if (wVerb) SHFree(wVerb);
-    if (wFile) SHFree(wFile);
-    if (wParameters) SHFree(wParameters);
-    if (wDirectory) SHFree(wDirectory);
+    SHFree(wVerb);
+    SHFree(wFile);
+    SHFree(wParameters);
+    SHFree(wDirectory);
 
     return HINSTANCE_16(seiW.hInstApp);
 }
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index 5c6dc61..641e263 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -614,8 +614,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR 
     if (hr != S_OK)
         ret = FALSE;
 
-    if (pidlLast)
-        SHFree(pidlLast);
+    SHFree(pidlLast);
 
 #ifdef MORE_DEBUG
     TRACE ("icon=%p index=0x%08x attr=0x%08lx name=%s type=%s ret=0x%08lx\n",
diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c
index 3d717d9..f2be4be 100644
--- a/dlls/shell32/shfldr_desktop.c
+++ b/dlls/shell32/shfldr_desktop.c
@@ -137,10 +137,8 @@ static ULONG WINAPI ISF_Desktop_fnReleas
     if (!refCount)
     {
         TRACE ("-- destroying IShellFolder(%p)\n", This);
-        if (This->pidlRoot)
-            SHFree (This->pidlRoot);
-        if (This->sPathTarget)
-            SHFree (This->sPathTarget);
+        SHFree (This->pidlRoot);
+        SHFree (This->sPathTarget);
         LocalFree ((HLOCAL) This);
         return 0;
     }
-- 
1.4.2.1