Squash2

Author: adityamandaleeka

src/utilcode/clrconfig.cpp

@@ -391,7 +391,7 @@ DWORD CLRConfig::GetConfigValue(const ConfigDWORDInfo & info, bool acceptExplici
             // If we are willing to accept the default value when it's set explicitly,
             // checking the HRESULT here is sufficient. E_FAIL is returned when the
             // default is used.
-            if (hr != E_FAIL)
+            if (SUCCEEDED(hr))
             {
                 *isDefault = false;
                 return resultMaybe;
@@ -456,7 +456,7 @@ DWORD CLRConfig::GetConfigValue(const ConfigDWORDInfo & info, bool acceptExplici
             // If we are willing to accept the default value when it's set explicitly,
             // checking the HRESULT here is sufficient. E_FAIL is returned when the
             // default is used.
-            if (hr != E_FAIL)
+            if if (SUCCEEDED(hr))
             {
                 *isDefault = false;
                 return resultMaybe;

src/utilcode/configuration.cpp

@@ -40,7 +40,8 @@ static LPCWSTR GetConfigurationValue(LPCWSTR name)
 
     for (int i = 0; i < numberOfKnobs; ++i)
     {
-        if (knobNames[i] != nullptr && (wcscmp(name, knobNames[i]) == 0))
+        _ASSERT(knobNames[i] != nullptr);
+        if (wcscmp(name, knobNames[i]) == 0)
         {
             return knobValues[i];
         }