James Hawkins : janitorial: Remove redundant NULL checks before
SHFree.
Alexandre Julliard
julliard at wine.codeweavers.com
Sat Oct 7 11:31:31 CDT 2006
Module: wine
Branch: master
Commit: 7b89ff88e85a95f1e16420d25654887c71adcc6b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b89ff88e85a95f1e16420d25654887c71adcc6b
Author: James Hawkins <truiken at gmail.com>
Date: Fri Oct 6 18:06:26 2006 -0700
janitorial: Remove redundant NULL checks before SHFree.
---
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 ++----
dlls/shell32/shfldr_fs.c | 16 +++++-----------
dlls/shell32/shfldr_mycomp.c | 3 +--
dlls/shell32/shlexec.c | 14 +++++++-------
dlls/shell32/shlmenu.c | 11 +++--------
dlls/shell32/shlview.c | 8 ++------
dlls/shell32/shv_item_cmenu.c | 3 +--
dlls/shell32/trash.c | 3 +--
15 files changed, 36 insertions(+), 68 deletions(-)
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;
}
diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
index 8bd6eaf..3c05e71 100644
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -194,10 +194,8 @@ static ULONG WINAPI IUnknown_fnRelease (
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 refCount;
@@ -1380,15 +1378,11 @@ IFSFldr_PersistFolder3_Initialize (IPers
TRACE ("(%p)->(%p)\n", This, pidl);
- if (This->pidlRoot)
- SHFree (This->pidlRoot); /* free the old pidl */
+ SHFree (This->pidlRoot); /* free the old pidl */
This->pidlRoot = ILClone (pidl); /* set my pidl */
- if (This->sPathTarget)
- {
- SHFree (This->sPathTarget);
- This->sPathTarget = NULL;
- }
+ SHFree (This->sPathTarget);
+ This->sPathTarget = NULL;
/* set my path */
if (SHGetPathFromIDListW (pidl, wszTemp)) {
diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c
index c9a5c07..c842c7e 100644
--- a/dlls/shell32/shfldr_mycomp.c
+++ b/dlls/shell32/shfldr_mycomp.c
@@ -186,8 +186,7 @@ static ULONG WINAPI ISF_MyComputer_fnRel
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/shlexec.c b/dlls/shell32/shlexec.c
index 6ca0b19..f5704c3 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -882,8 +882,8 @@ HINSTANCE WINAPI FindExecutableA(LPCSTR
retval = FindExecutableW(wFile, wDirectory, wResult);
WideCharToMultiByte(CP_ACP, 0, wResult, -1, lpResult, MAX_PATH, NULL, NULL);
- if (wFile) SHFree( wFile );
- if (wDirectory) SHFree( wDirectory );
+ SHFree( wFile );
+ SHFree( wDirectory );
TRACE("returning %s\n", lpResult);
return retval;
@@ -1580,11 +1580,11 @@ BOOL WINAPI ShellExecuteExA (LPSHELLEXEC
if (sei->fMask & SEE_MASK_NOCLOSEPROCESS)
sei->hProcess = seiW.hProcess;
- if (wVerb) SHFree(wVerb);
- if (wFile) SHFree(wFile);
- if (wParameters) SHFree(wParameters);
- if (wDirectory) SHFree(wDirectory);
- if (wClass) SHFree(wClass);
+ SHFree(wVerb);
+ SHFree(wFile);
+ SHFree(wParameters);
+ SHFree(wDirectory);
+ SHFree(wClass);
return ret;
}
diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index 42cec7a..065e3c1 100644
--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -115,9 +115,7 @@ static LPFMINFO FM_SetMenuParameter(
menudata = FM_GetMenuInfo(hmenu);
- if ( menudata->pidl)
- { SHFree(menudata->pidl);
- }
+ SHFree(menudata->pidl);
menudata->uID = uID;
menudata->pidl = ILClone(pidl);
@@ -299,9 +297,7 @@ void WINAPI FileMenu_Destroy (HMENU hmen
menudata = FM_GetMenuInfo(hmenu);
- if ( menudata->pidl)
- { SHFree( menudata->pidl);
- }
+ SHFree( menudata->pidl);
HeapFree(GetProcessHeap(), 0, menudata);
DestroyMenu (hmenu);
@@ -692,8 +688,7 @@ BOOL WINAPI FileMenu_DeleteAllItems (HME
for (i = 0; i < GetMenuItemCount( hmenu ); i++)
{ GetMenuItemInfoW(hmenu, i, TRUE, &mii );
- if (mii.dwItemData)
- SHFree((LPFMINFO)mii.dwItemData);
+ SHFree((LPFMINFO)mii.dwItemData);
if (mii.hSubMenu)
FileMenu_Destroy(mii.hSubMenu);
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index d605fca..914071b 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -811,10 +811,7 @@ static UINT ShellView_GetSelections(IShe
LVITEMA lvItem;
UINT i = 0;
- if (This->apidl)
- {
- SHFree(This->apidl);
- }
+ SHFree(This->apidl);
This->cidl = ListView_GetSelectedCount(This->hWndList);
This->apidl = (LPITEMIDLIST*)SHAlloc(This->cidl * sizeof(LPITEMIDLIST));
@@ -1713,8 +1710,7 @@ static ULONG WINAPI IShellView_fnRelease
if(This->pSF2Parent)
IShellFolder2_Release(This->pSF2Parent);
- if(This->apidl)
- SHFree(This->apidl);
+ SHFree(This->apidl);
if(This->pAdvSink)
IAdviseSink_Release(This->pAdvSink);
diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c
index 7d3d08c..ca2d593 100644
--- a/dlls/shell32/shv_item_cmenu.c
+++ b/dlls/shell32/shv_item_cmenu.c
@@ -166,8 +166,7 @@ static ULONG WINAPI ISvItemCm_fnRelease(
if(This->pSFParent)
IShellFolder_Release(This->pSFParent);
- if(This->pidl)
- SHFree(This->pidl);
+ SHFree(This->pidl);
/*make sure the pidl is freed*/
_ILFreeaPidl(This->apidl, This->cidl);
diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c
index fc0ce42..4fe43e5 100644
--- a/dlls/shell32/trash.c
+++ b/dlls/shell32/trash.c
@@ -377,8 +377,7 @@ HRESULT TRASH_UnpackItemID(LPCSHITEMID i
void TRASH_DisposeElement(TRASH_ELEMENT *element)
{
- if (element)
- SHFree(element->filename);
+ SHFree(element->filename);
}
HRESULT TRASH_GetDetails(const TRASH_ELEMENT *element, WIN32_FIND_DATAW *data)
More information about the wine-cvs
mailing list