Reorder GenerateStateFromBeaconAndAttemptCount.

chrome_elf/blacklist/blacklist.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_elf/blacklist/blacklist.h"
 
 #include <assert.h>
 #include <string.h>
 
 #include <vector>
@@ skipping 69 matching lines @@
   return ::RegSetValueEx(*key,
                          property,
                          0,
                          REG_DWORD,
                          reinterpret_cast<LPBYTE>(&value),
                          sizeof(value));
 }
 
 bool GenerateStateFromBeaconAndAttemptCount(HKEY* key, DWORD blacklist_state) {
   LONG result = 0;
-  if (blacklist_state == blacklist::BLACKLIST_SETUP_RUNNING) {

[robertshield, 2014/08/25 13:40:18]

previously, BLACKLIST_STATE_FAILED would hit this branch (and return false) as
well. Just double checking that the fact that it now doesn't and will return
true instead is intentional.

+  if (blacklist_state == blacklist::BLACKLIST_ENABLED) {
+    // If the blacklist succeeded on the previous run reset the failure
+    // counter.
+    return (SetDWValue(key,
+                       blacklist::kBeaconAttemptCount,
+                       static_cast<DWORD>(0)) == ERROR_SUCCESS);
+  } else {
     // Some part of the blacklist setup failed last time.  If this has occured
     // blacklist::kBeaconMaxAttempts times in a row we switch the state to
     // failed and skip setting up the blacklist.
     DWORD attempt_count = 0;
     DWORD attempt_count_size = sizeof(attempt_count);
     result = ::RegQueryValueEx(*key,
                                blacklist::kBeaconAttemptCount,
                                0,
                                NULL,
                                reinterpret_cast<LPBYTE>(&attempt_count),
                                &attempt_count_size);
 
     if (result == ERROR_FILE_NOT_FOUND)
       attempt_count = 0;
     else if (result != ERROR_SUCCESS)
       return false;
 
     ++attempt_count;
     SetDWValue(key, blacklist::kBeaconAttemptCount, attempt_count);
 
     if (attempt_count >= blacklist::kBeaconMaxAttempts) {
       blacklist_state = blacklist::BLACKLIST_SETUP_FAILED;
       SetDWValue(key, blacklist::kBeaconState, blacklist_state);
-      return false;
     }
-  } else if (blacklist_state == blacklist::BLACKLIST_ENABLED) {
-    // If the blacklist succeeded on the previous run reset the failure
-    // counter.
-    result =
-        SetDWValue(key, blacklist::kBeaconAttemptCount, static_cast<DWORD>(0));
-    if (result != ERROR_SUCCESS) {
-      return false;
-    }
+
+    return false;
   }
-  return true;
 }
 
 }  // namespace
 
 namespace blacklist {
 
 #if defined(_WIN64)
   // Allocate storage for the pointer to the old NtMapViewOfSectionFunction.
 #pragma section(".oldntmap",write,read)
   __declspec(allocate(".oldntmap"))
@@ skipping 299 matching lines @@
       break;
     value_buffer[value_len - 1] = L'\0';
     AddDllToBlacklist(&value_buffer[0]);
   }
 
   ::RegCloseKey(key);
   return;
 }
 
 }  // namespace blacklist