James Hawkins : janitorial: Remove redundant NULL checks before CoTaskMemFree (found by Smatch).
Module: wine Branch: master Commit: 99e2c6dff20f1692d70073b38e8fad43722269ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e2c6dff20f1692d70073b38e... Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 6 18:05:08 2006 -0700 janitorial: Remove redundant NULL checks before CoTaskMemFree (found by Smatch). --- dlls/devenum/devenum_main.c | 4 +-- dlls/devenum/parsedisplayname.c | 3 +- dlls/msdmo/dmort.c | 7 ++--- dlls/oleaut32/usrmarshal.c | 3 +- dlls/qcap/enummedia.c | 8 ++---- dlls/quartz/filesource.c | 17 +++++-------- dlls/quartz/filtermapper.c | 51 +++++++++++++-------------------------- 7 files changed, 31 insertions(+), 62 deletions(-) diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index b61e0f8..4a45971 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -278,9 +278,7 @@ HRESULT WINAPI DllRegisterServer(void) if (hkeyClsid) RegCloseKey(hkeyClsid); - if (pszClsidDevMon) - CoTaskMemFree(pszClsidDevMon); - + CoTaskMemFree(pszClsidDevMon); CoUninitialize(); return res; diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index 310ea95..091ad08 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -147,8 +147,7 @@ static HRESULT WINAPI DEVENUM_IParseDisp if (pEm) IEnumMoniker_Release(pEm); - if (pszClass) - CoTaskMemFree(pszClass); + CoTaskMemFree(pszClass); TRACE("-- returning: %lx\n", res); return res; diff --git a/dlls/msdmo/dmort.c b/dlls/msdmo/dmort.c index bf788a5..d72d376 100644 --- a/dlls/msdmo/dmort.c +++ b/dlls/msdmo/dmort.c @@ -121,11 +121,8 @@ HRESULT WINAPI MoFreeMediaType(DMO_MEDIA pmedia->pUnk = NULL; } - if (pmedia->pbFormat) - { - CoTaskMemFree(pmedia->pbFormat); - pmedia->pbFormat = NULL; - } + CoTaskMemFree(pmedia->pbFormat); + pmedia->pbFormat = NULL; return S_OK; } diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 90782c7..04b64b9 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1726,8 +1726,7 @@ void CALLBACK ITypeInfo_ReleaseVarDesc_P { TRACE("(%p, %p)\n", This, pVarDesc); - if(pVarDesc->lpstrSchema) - CoTaskMemFree(pVarDesc->lpstrSchema); + CoTaskMemFree(pVarDesc->lpstrSchema); if(pVarDesc->varkind == VAR_CONST) CoTaskMemFree(pVarDesc->u.lpvarValue); diff --git a/dlls/qcap/enummedia.c b/dlls/qcap/enummedia.c index a57d8a9..8f33611 100644 --- a/dlls/qcap/enummedia.c +++ b/dlls/qcap/enummedia.c @@ -47,11 +47,9 @@ HRESULT CopyMediaType(AM_MEDIA_TYPE * pD void FreeMediaType(AM_MEDIA_TYPE * pMediaType) { - if (pMediaType->pbFormat) - { - CoTaskMemFree(pMediaType->pbFormat); - pMediaType->pbFormat = NULL; - } + CoTaskMemFree(pMediaType->pbFormat); + pMediaType->pbFormat = NULL; + if (pMediaType->pUnk) { IUnknown_Release(pMediaType->pUnk); diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a44ca36..23fb1fb 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -620,11 +620,10 @@ static HRESULT WINAPI FileSource_Load(IF IPin_Release(This->pOutputPin); This->pOutputPin = NULL; } - if (This->pszFileName) - { - CoTaskMemFree(This->pszFileName); - This->pszFileName = NULL; - } + + CoTaskMemFree(This->pszFileName); + This->pszFileName = NULL; + CloseHandle(hFile); } @@ -1079,12 +1078,8 @@ static HRESULT WINAPI FileAsyncReader_Wa *pdwUser = pDataRq->dwUserData; } - /* clean up */ - if (pDataRq) - { - /* no need to close event handle since we will close it when the pin is destroyed */ - CoTaskMemFree(pDataRq); - } + /* no need to close event handle since we will close it when the pin is destroyed */ + CoTaskMemFree(pDataRq); TRACE("-- %lx\n", hr); return hr; diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 5a5eaf3..7a92a7e 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -152,8 +152,7 @@ static int find_data(struct Vector * v, static void delete_vector(struct Vector * v) { - if (v->pData) - CoTaskMemFree(v->pData); + CoTaskMemFree(v->pData); v->current = 0; v->capacity = 0; } @@ -288,11 +287,8 @@ static HRESULT WINAPI FilterMapper2_Crea } CloseHandle(hKey); - - if (wClsidCategory) - CoTaskMemFree(wClsidCategory); - if (wClsidAMCat) - CoTaskMemFree(wClsidAMCat); + CoTaskMemFree(wClsidCategory); + CoTaskMemFree(wClsidAMCat); return hr; } @@ -336,10 +332,8 @@ static HRESULT WINAPI FilterMapper2_Unre hr = HRESULT_FROM_WIN32(lRet); } - if (wClsidCategory) - CoTaskMemFree(wClsidCategory); - if (wFilter) - CoTaskMemFree(wFilter); + CoTaskMemFree(wClsidCategory); + CoTaskMemFree(wFilter); return hr; } @@ -368,8 +362,7 @@ static HRESULT FM2_WriteClsid(IPropertyB V_UNION(&var, bstrVal) = wszClsid; hr = IPropertyBag_Write(pPropBag, wszClsidName, &var); } - if (wszClsid) - CoTaskMemFree(wszClsid); + CoTaskMemFree(wszClsid); return hr; } @@ -748,11 +741,9 @@ static HRESULT WINAPI FilterMapper2_Regi strcpyW(pCurrent+1, szInstance); else { - if (szClsidTemp) - { - CoTaskMemFree(szClsidTemp); - szClsidTemp = NULL; - } + CoTaskMemFree(szClsidTemp); + szClsidTemp = NULL; + hr = StringFromCLSID(clsidFilter, &szClsidTemp); if (SUCCEEDED(hr)) strcpyW(pCurrent+1, szClsidTemp); @@ -787,16 +778,14 @@ static HRESULT WINAPI FilterMapper2_Regi if (pPropBag) IPropertyBag_Release(pPropBag); - if (szClsidTemp) - CoTaskMemFree(szClsidTemp); + CoTaskMemFree(szClsidTemp); if (SUCCEEDED(hr) && ppMoniker) *ppMoniker = pMoniker; else if (pMoniker) IMoniker_Release(pMoniker); - if (pregfp2) - CoTaskMemFree(pregfp2); + CoTaskMemFree(pregfp2); TRACE("-- returning %lx\n", hr); @@ -1360,8 +1349,7 @@ static HRESULT WINAPI FilterMapper_Regis hr = HRESULT_FROM_WIN32(lRet); } - if (wszClsid) - CoTaskMemFree(wszClsid); + CoTaskMemFree(wszClsid); if (hKey) CloseHandle(hKey); if (hPinsKey) @@ -1437,12 +1425,9 @@ static HRESULT WINAPI FilterMapper_Regis CloseHandle(hKey); } - if (wszClsid) - CoTaskMemFree(wszClsid); - if (wszClsidMajorType) - CoTaskMemFree(wszClsidMajorType); - if (wszClsidSubType) - CoTaskMemFree(wszClsidSubType); + CoTaskMemFree(wszClsid); + CoTaskMemFree(wszClsidMajorType); + CoTaskMemFree(wszClsidSubType); return hr; } @@ -1488,8 +1473,7 @@ static HRESULT WINAPI FilterMapper_Unreg CloseHandle(hKey); } - if (wszClsid) - CoTaskMemFree(wszClsid); + CoTaskMemFree(wszClsid); return hr; } @@ -1546,8 +1530,7 @@ static HRESULT WINAPI FilterMapper_Unreg CoTaskMemFree(wszPinNameKey); } - if (wszClsid) - CoTaskMemFree(wszClsid); + CoTaskMemFree(wszClsid); if (hKey) CloseHandle(hKey);
participants (1)
-
Alexandre Julliard