diff options
| author | scottmg <scottmg@chromium.org> | 2015-02-23 09:33:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-23 17:34:03 +0000 |
| commit | edba32ccb3147b5bc034f44a26d5e886c72f0366 (patch) | |
| tree | ddfb8f77f51f9fe5256b246459da1673fbcd529b /net/base | |
| parent | 9fb3d5b62a6466053aeee3a26c0d0a898428f4eb (diff) | |
| download | chromium_src-edba32ccb3147b5bc034f44a26d5e886c72f0366.zip chromium_src-edba32ccb3147b5bc034f44a26d5e886c72f0366.tar.gz chromium_src-edba32ccb3147b5bc034f44a26d5e886c72f0366.tar.bz2 | |
win vs2015: fix variable shadowing warnings in net/base
d:\src\cr2\src\net\base\mime_util.cc(1286): warning C4456: declaration of 'extension' hides previous local declaration
d:\src\cr2\src\net\base\mime_util.cc(1278): note: see declaration of 'extension'
d:\src\cr2\src\net\base\upload_file_element_reader.cc(122): warning C4457: declaration of 'result' hides function parameter
d:\src\cr2\src\net\base\upload_file_element_reader.cc(106): note: see declaration of 'result'
d:\src\cr2\src\net\base\url_util.cc(47): warning C4457: declaration of 'value' hides function parameter
d:\src\cr2\src\net\base\url_util.cc(33): note: see declaration of 'value'
R=rdsmith@chromium.org
BUG=440500
Review URL: https://codereview.chromium.org/945713002
Cr-Commit-Position: refs/heads/master@{#317603}
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/mime_util.cc | 1 | ||||
| -rw-r--r-- | net/base/upload_file_element_reader.cc | 11 | ||||
| -rw-r--r-- | net/base/url_util.cc | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index 7b51b41..889525b 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -1275,7 +1275,6 @@ void GetExtensionsFromHardCodedMappings( size_t mappings_len, const std::string& leading_mime_type, base::hash_set<base::FilePath::StringType>* extensions) { - base::FilePath::StringType extension; for (size_t i = 0; i < mappings_len; ++i) { if (StartsWithASCII(mappings[i].mime_type, leading_mime_type, false)) { std::vector<string> this_extensions; diff --git a/net/base/upload_file_element_reader.cc b/net/base/upload_file_element_reader.cc index 864584d..04b6f82 100644 --- a/net/base/upload_file_element_reader.cc +++ b/net/base/upload_file_element_reader.cc @@ -119,14 +119,13 @@ void UploadFileElementReader::OnOpenCompleted( } if (range_offset_) { - int result = file_stream_->Seek( + int seek_result = file_stream_->Seek( base::File::FROM_BEGIN, range_offset_, base::Bind(&UploadFileElementReader::OnSeekCompleted, - weak_ptr_factory_.GetWeakPtr(), - callback)); - DCHECK_GT(0, result); - if (result != ERR_IO_PENDING) - callback.Run(result); + weak_ptr_factory_.GetWeakPtr(), callback)); + DCHECK_GT(0, seek_result); + if (seek_result != ERR_IO_PENDING) + callback.Run(seek_result); } else { OnSeekCompleted(callback, OK); } diff --git a/net/base/url_util.cc b/net/base/url_util.cc index 8540e19..791f125 100644 --- a/net/base/url_util.cc +++ b/net/base/url_util.cc @@ -43,8 +43,6 @@ GURL AppendOrReplaceQueryParameter(const GURL& url, &value_range)) { const base::StringPiece key( input.data() + key_range.begin, key_range.len); - const base::StringPiece value( - input.data() + value_range.begin, value_range.len); std::string key_value_pair; // Check |replaced| as only the first pair should be replaced. if (!replaced && key == param_name) { |