diff options
| author | scottmg <scottmg@chromium.org> | 2015-02-03 17:19:29 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-04 01:20:37 +0000 |
| commit | 0785e96af47371df486135eaad53f3e1842d20c8 (patch) | |
| tree | 8e72d63ab7dd2373a87b267d4c2c51afa097a8cf /net | |
| parent | 0d5d6972f43a7bdbb0e5e0b78a9630f64024d328 (diff) | |
| download | chromium_src-0785e96af47371df486135eaad53f3e1842d20c8.zip chromium_src-0785e96af47371df486135eaad53f3e1842d20c8.tar.gz chromium_src-0785e96af47371df486135eaad53f3e1842d20c8.tar.bz2 | |
kMaxBlockSize -> kMaxHeaderBlockSize to avoid shadowing warning on VS2015
R=rvargas@chromium.rog
BUG=452692
Review URL: https://codereview.chromium.org/899733002
Cr-Commit-Position: refs/heads/master@{#314460}
Diffstat (limited to 'net')
| -rw-r--r-- | net/disk_cache/blockfile/block_files.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/disk_cache/blockfile/block_files.cc b/net/disk_cache/blockfile/block_files.cc index 9aa8f0f..f46a937 100644 --- a/net/disk_cache/blockfile/block_files.cc +++ b/net/disk_cache/blockfile/block_files.cc @@ -656,11 +656,11 @@ bool BlockFiles::FixBlockFileHeader(MappedFile* file) { if (file_size < file_header.Size()) return false; // file_size > 2GB is also an error. - const int kMinBlockSize = 36; - const int kMaxBlockSize = 4096; + const int kMinHeaderBlockSize = 36; + const int kMaxHeaderBlockSize = 4096; BlockFileHeader* header = file_header.Header(); - if (header->entry_size < kMinBlockSize || - header->entry_size > kMaxBlockSize || header->num_entries < 0) + if (header->entry_size < kMinHeaderBlockSize || + header->entry_size > kMaxHeaderBlockSize || header->num_entries < 0) return false; // Make sure that we survive crashes. |