From 7597eb097c5b65da9248ad5fe20f683b4a26b153 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Mon, 22 Mar 2021 23:27:43 +0900 Subject: [PATCH] Fix GitHub issue #690: Plugins.cpp function SearchScriptForMethodName can be improved --- Src/Plugins.cpp | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/Src/Plugins.cpp b/Src/Plugins.cpp index 6c610af3e..45eac8348 100644 --- a/Src/Plugins.cpp +++ b/Src/Plugins.cpp @@ -167,39 +167,33 @@ int GetPropertyGetsFromScript(IDispatch *piDispatch, vector& namesArray, // search a function name in a scriptlet or activeX dll bool SearchScriptForMethodName(LPDISPATCH piDispatch, const wchar_t *functionName) { - bool bFound = false; - vector namesArray; vector IdArray; - int nFnc = GetMethodsFromScript(piDispatch, namesArray, IdArray); + const int nFnc = GetMethodsFromScript(piDispatch, namesArray, IdArray); - String tfuncname = ucr::toTString(functionName); - int iFnc; - for (iFnc = 0 ; iFnc < nFnc ; iFnc++) + const String tfuncname = ucr::toTString(functionName); + for (int iFnc = 0 ; iFnc < nFnc ; iFnc++) { if (namesArray[iFnc] == tfuncname) - bFound = true; + return true; } - return bFound; + return false; } // search a property name (with get interface) in a scriptlet or activeX dll bool SearchScriptForDefinedProperties(IDispatch *piDispatch, const wchar_t *functionName) { - bool bFound = false; - vector namesArray; vector IdArray; - int nFnc = GetPropertyGetsFromScript(piDispatch, namesArray, IdArray); + const int nFnc = GetPropertyGetsFromScript(piDispatch, namesArray, IdArray); - String tfuncname = ucr::toTString(functionName); - int iFnc; - for (iFnc = 0 ; iFnc < nFnc ; iFnc++) + const String tfuncname = ucr::toTString(functionName); + for (int iFnc = 0 ; iFnc < nFnc ; iFnc++) { if (namesArray[iFnc] == tfuncname) - bFound = true; + return true; } - return bFound; + return false; } @@ -207,9 +201,7 @@ int CountMethodsInScript(LPDISPATCH piDispatch) { vector namesArray; vector IdArray; - int nFnc = GetMethodsFromScript(piDispatch, namesArray, IdArray); - - return nFnc; + return GetMethodsFromScript(piDispatch, namesArray, IdArray); } /** @@ -221,7 +213,7 @@ int GetMethodIDInScript(LPDISPATCH piDispatch, int methodIndex) vector namesArray; vector IdArray; - int nFnc = GetMethodsFromScript(piDispatch, namesArray, IdArray); + const int nFnc = GetMethodsFromScript(piDispatch, namesArray, IdArray); if (methodIndex < nFnc) { -- 2.11.0