Refactored GetString for variable locality

This commit is contained in:
Nicholas Baron 2019-05-05 14:54:39 -07:00
commit 55c58a641f

View file

@ -107,12 +107,12 @@ public:
HRESULT GetString(_Out_ std::wstring* expression) HRESULT GetString(_Out_ std::wstring* expression)
{ {
HRESULT hr = S_OK;
unsigned int nTokens = 0; unsigned int nTokens = 0;
std::pair <std::wstring, int> currentPair; auto hr = this->GetSize(&nTokens);
hr = this->GetSize(&nTokens);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
std::pair<std::wstring, int> currentPair;
for (unsigned int i = 0; i < nTokens; i++) for (unsigned int i = 0; i < nTokens; i++)
{ {
hr = this->GetAt(i, &currentPair); hr = this->GetAt(i, &currentPair);
@ -128,7 +128,7 @@ public:
} }
std::wstring expressionSuffix{}; std::wstring expressionSuffix{};
hr = GetExpressionSuffix(&expressionSuffix); hr = GetExpressionSuffix(&expressionSuffix); // Will always return S_OK
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
expression->append(expressionSuffix); expression->append(expressionSuffix);