From 0109570c76882b6fed716fd47750e8b9cf649511 Mon Sep 17 00:00:00 2001 From: sdottaka Date: Sun, 21 Apr 2013 22:08:35 +0900 Subject: [PATCH] Cppcheck: syntax error --- Src/Common/lwdisp.c | 24 ++++++++++++------------ Src/Common/version.cpp | 2 +- Src/MainFrm.cpp | 6 +++--- Src/Plugins.cpp | 10 +++++----- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Src/Common/lwdisp.c b/Src/Common/lwdisp.c index 4d3e400a2..de6cd90ba 100644 --- a/Src/Common/lwdisp.c +++ b/Src/Common/lwdisp.c @@ -152,7 +152,7 @@ LPDISPATCH CreatDispatchBy32BitProxy(LPCTSTR source, LPCWSTR progid) sc = CLSIDFromProgID(L"WinMerge32BitPluginProxy.Loader", &clsid); if SUCCEEDED(sc) sc = CoCreateInstance(&clsid, 0, CLSCTX_LOCAL_SERVER|CLSCTX_ACTIVATE_32_BIT_SERVER, &IID_IDispatch, &pv); - if FAILED(sc) + if (FAILED(sc)) { LPTSTR errorText = ReportError(sc, 0); LPTSTR tmp; @@ -175,7 +175,7 @@ LPDISPATCH CreatDispatchBy32BitProxy(LPCTSTR source, LPCWSTR progid) V_VT(&v[0]) = VT_BSTR; V_BSTR(&v[0]) = SysAllocString(progid); sc = invokeW(pv, &ret, L"Load", opFxn[2], v); - if SUCCEEDED(sc) + if (SUCCEEDED(sc)) pv = V_DISPATCH(&ret); VariantClear(&v[0]); VariantClear(&v[1]); @@ -195,7 +195,7 @@ LPDISPATCH CreateDispatchBySourceAndCLSID(LPCTSTR source, CLSID *pObjectCLSID) ); mycpyt2a(source, Dll.SIG+strlen(Dll.SIG), sizeof(Dll.SIG)-strlen(Dll.SIG)); if ((FARPROC)DLLPROXY(Dll)->DllGetClassObject != DllProxy_ModuleState.Unresolved) - if SUCCEEDED(sc=DLLPROXY(Dll)->DllGetClassObject(pObjectCLSID, &IID_IClassFactory, &piClassFactory)) + if (SUCCEEDED(sc=DLLPROXY(Dll)->DllGetClassObject(pObjectCLSID, &IID_IClassFactory, &piClassFactory))) { sc=piClassFactory->lpVtbl->CreateInstance(piClassFactory, 0, &IID_IDispatch, &pv); } @@ -221,7 +221,7 @@ LPDISPATCH NTAPI CreateDispatchBySource(LPCTSTR source, LPCWSTR progid) if (source == 0) { CLSID clsid; - if SUCCEEDED(sc=CLSIDFromProgID(progid, &clsid)) + if (SUCCEEDED(sc=CLSIDFromProgID(progid, &clsid))) { sc=CoCreateInstance(&clsid, 0, CLSCTX_ALL, &IID_IDispatch, &pv); } @@ -234,19 +234,19 @@ LPDISPATCH NTAPI CreateDispatchBySource(LPCTSTR source, LPCWSTR progid) // search in the interface of the dll for the CLSID of progid ITypeLib *piTypeLib; mycpyt2w(source, wc, DIMOF(wc)); - if SUCCEEDED(sc=LoadTypeLib(wc, &piTypeLib)) + if (SUCCEEDED(sc=LoadTypeLib(wc, &piTypeLib))) { UINT count = piTypeLib->lpVtbl->GetTypeInfoCount(piTypeLib); while (SUCCEEDED(sc) && !bGUIDFound && count--) { ITypeInfo *piTypeInfo; - if SUCCEEDED(sc=piTypeLib->lpVtbl->GetTypeInfo(piTypeLib, count, &piTypeInfo)) + if (SUCCEEDED(sc=piTypeLib->lpVtbl->GetTypeInfo(piTypeLib, count, &piTypeInfo))) { TYPEATTR *pTypeAttr; - if SUCCEEDED(sc=piTypeInfo->lpVtbl->GetTypeAttr(piTypeInfo, &pTypeAttr)) + if (SUCCEEDED(sc=piTypeInfo->lpVtbl->GetTypeAttr(piTypeInfo, &pTypeAttr))) { BSTR bstrName = 0; - if SUCCEEDED(sc=piTypeInfo->lpVtbl->GetDocumentation(piTypeInfo, MEMBERID_NIL, &bstrName, 0, 0, 0)) + if (SUCCEEDED(sc=piTypeInfo->lpVtbl->GetDocumentation(piTypeInfo, MEMBERID_NIL, &bstrName, 0, 0, 0))) { if (pTypeAttr->typekind == TKIND_COCLASS && StrCmpIW(bstrName, progid) == 0) { @@ -332,7 +332,7 @@ LPDISPATCH NTAPI CreateDispatchBySource(LPCTSTR source, LPCWSTR progid) if (sc == MK_E_INTERMEDIATEINTERFACENOTSUPPORTED || sc == E_UNEXPECTED) sc = 0; } - if FAILED(sc) + if (FAILED(sc)) { // get the error description LPTSTR errorText = ReportError(sc, 0); @@ -431,7 +431,7 @@ STDAPI invokeV(LPDISPATCH pi, VARIANT *ret, DISPID id, LPCCH op, VARIANT *argv) sc = pi->lpVtbl->Invoke(pi, id, &IID_NULL, 0, wFlags, &dispparams, ret, &excepInfo, &nArgErr); - if FAILED(sc) + if (FAILED(sc)) { if (excepInfo.pfnDeferredFillIn) { @@ -496,7 +496,7 @@ HRESULT invokeW(LPDISPATCH pi, VARIANT *ret, LPCOLESTR silent, LPCCH op, VARIANT if (pi) { HRESULT sc = pi->lpVtbl->GetIDsOfNames(pi, &IID_NULL, &name, 1, 0, &id); - if FAILED(sc) + if (FAILED(sc)) { if (!((UINT_PTR)silent & 1)) { @@ -529,7 +529,7 @@ STDAPI ValidateArgs(VARIANT *argv, UINT argc, LPCCH pvt) if (V_VT(argv) != vt) { HRESULT sc = VariantChangeType(argv, argv, 0, vt); - if FAILED(sc) + if (FAILED(sc)) return sc; } else if (vt == VT_BSTR) diff --git a/Src/Common/version.cpp b/Src/Common/version.cpp index 6ae190ce8..8cf34dbaf 100644 --- a/Src/Common/version.cpp +++ b/Src/Common/version.cpp @@ -310,7 +310,7 @@ void CVersionInfo::GetVersionInfo() if (DllGetVersion) { m_dvi.cbSize = sizeof(m_dvi); - if FAILED(DllGetVersion(&m_dvi)) + if (FAILED(DllGetVersion(&m_dvi))) { m_dvi.cbSize = 0; } diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 5de353612..39d28af09 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -1231,7 +1231,7 @@ BOOL CMainFrame::DoFileOpen(PathContext * pFiles /*=NULL*/, } do { - if FAILED(piHandler->DeCompressArchive(m_hWnd, files[0].c_str(), path.c_str())) + if (FAILED(piHandler->DeCompressArchive(m_hWnd, files[0].c_str(), path.c_str()))) break; if (files[0].find(path) == 0) { @@ -1256,7 +1256,7 @@ BOOL CMainFrame::DoFileOpen(PathContext * pFiles /*=NULL*/, path = env_GetTempChildPath(); do { - if FAILED(piHandler->DeCompressArchive(m_hWnd, files[1].c_str(), path.c_str())) + if (FAILED(piHandler->DeCompressArchive(m_hWnd, files[1].c_str(), path.c_str()))) break;; if (files[1].find(path) == 0) { @@ -1283,7 +1283,7 @@ BOOL CMainFrame::DoFileOpen(PathContext * pFiles /*=NULL*/, path = env_GetTempChildPath(); do { - if FAILED(piHandler->DeCompressArchive(m_hWnd, files[2].c_str(), path.c_str())) + if (FAILED(piHandler->DeCompressArchive(m_hWnd, files[2].c_str(), path.c_str()))) break;; if (files[2].find(path) == 0) { diff --git a/Src/Plugins.cpp b/Src/Plugins.cpp index 683624839..e19752564 100644 --- a/Src/Plugins.cpp +++ b/Src/Plugins.cpp @@ -109,10 +109,10 @@ int GetFunctionsFromScript(IDispatch *piDispatch, vector& namesArray, ve ITypeInfo *piTypeInfo=0; unsigned iTInfo = 0; // 0 for type information of IDispatch itself LCID lcid=0; // locale for localized method names (ignore if no localized names) - if SUCCEEDED(hr = piDispatch->GetTypeInfo(iTInfo, lcid, &piTypeInfo)) + if (SUCCEEDED(hr = piDispatch->GetTypeInfo(iTInfo, lcid, &piTypeInfo))) { TYPEATTR *pTypeAttr=0; - if SUCCEEDED(hr = piTypeInfo->GetTypeAttr(&pTypeAttr)) + if (SUCCEEDED(hr = piTypeInfo->GetTypeAttr(&pTypeAttr))) { // allocate arrays for the returned structures // the names array is NULL terminated @@ -124,7 +124,7 @@ int GetFunctionsFromScript(IDispatch *piDispatch, vector& namesArray, ve { UINT iFuncDesc = iMaxFunc - iFunc; FUNCDESC *pFuncDesc; - if SUCCEEDED(hr = piTypeInfo->GetFuncDesc(iFuncDesc, &pFuncDesc)) + if (SUCCEEDED(hr = piTypeInfo->GetFuncDesc(iFuncDesc, &pFuncDesc))) { // exclude properties // exclude IDispatch inherited methods @@ -132,8 +132,8 @@ int GetFunctionsFromScript(IDispatch *piDispatch, vector& namesArray, ve { BSTR bstrName; UINT cNames; - if SUCCEEDED(hr = piTypeInfo->GetNames(pFuncDesc->memid, - &bstrName, 1, &cNames)) + if (SUCCEEDED(hr = piTypeInfo->GetNames(pFuncDesc->memid, + &bstrName, 1, &cNames))) { IdArray[iValidFunc] = pFuncDesc->memid; namesArray[iValidFunc] = ucr::toTString(bstrName); -- 2.11.0