summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-27 15:38:07 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-27 15:38:07 +0000
commitf55bd486ab0ada0402fdcd34fb70a20d155fd968 (patch)
tree1eb9cf7c078d40c20320126d34f4cc4694082b1f /net/tools
parent4b0bd5f4c2d58c1620b49628be68f877928025fd (diff)
downloadchromium_src-f55bd486ab0ada0402fdcd34fb70a20d155fd968.zip
chromium_src-f55bd486ab0ada0402fdcd34fb70a20d155fd968.tar.gz
chromium_src-f55bd486ab0ada0402fdcd34fb70a20d155fd968.tar.bz2
Enable warning 4389 as an error on windows builds. This will make
windows builds more similar to linux/mac, which already treat signed/ unsigned equality comparisons as warnings (and hence errors). BUG=44471 TEST=none Review URL: http://codereview.chromium.org/2222002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48395 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rw-r--r--net/tools/dump_cache/cache_dumper.cc8
-rw-r--r--net/tools/dump_cache/upgrade.cc8
2 files changed, 10 insertions, 6 deletions
diff --git a/net/tools/dump_cache/cache_dumper.cc b/net/tools/dump_cache/cache_dumper.cc
index 20ba6b5..a2e071a3 100644
--- a/net/tools/dump_cache/cache_dumper.cc
+++ b/net/tools/dump_cache/cache_dumper.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -89,6 +89,10 @@ bool DiskDumper::CreateEntry(const std::string& key,
#ifdef WIN32_LARGE_FILENAME_SUPPORT
entry_ = CreateFileW(file.c_str(), GENERIC_WRITE|GENERIC_READ, 0, 0,
CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+ if (entry_ == INVALID_HANDLE_VALUE) {
+ wprintf(L"CreateFileW (%s) failed: %d\n", file.c_str(), GetLastError());
+ return false;
+ }
return entry_ != INVALID_HANDLE_VALUE;
#else
entry_ = file_util::OpenFile(entry_path_, "w+");
@@ -184,7 +188,7 @@ bool DiskDumper::WriteEntry(disk_cache::Entry* entry, int index, int offset,
#ifdef WIN32_LARGE_FILENAME_SUPPORT
DWORD bytes;
DWORD rv = WriteFile(entry_, data, len, &bytes, 0);
- return rv == TRUE && bytes == len;
+ return rv == TRUE && bytes == static_cast<DWORD>(len);
#else
int bytes = fwrite(data, 1, len, entry_);
return bytes == len;
diff --git a/net/tools/dump_cache/upgrade.cc b/net/tools/dump_cache/upgrade.cc
index 566eb0b..71031dc 100644
--- a/net/tools/dump_cache/upgrade.cc
+++ b/net/tools/dump_cache/upgrade.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -367,11 +367,11 @@ void MasterSM::DoGetKey(int bytes_read) {
return Fail();
std::string key(input_->buffer);
- DCHECK(key.size() == input_->msg.buffer_bytes - 1);
+ DCHECK(key.size() == static_cast<size_t>(input_->msg.buffer_bytes - 1));
if (!writer_->CreateEntry(key,
reinterpret_cast<disk_cache::Entry**>(&entry_))) {
- printf("Skipping entry \"%s\" (name conflict!)\n", key.c_str());
+ printf("Skipping entry \"%s\": %d\n", key.c_str(), GetLastError());
return SendGetPrevEntry();
}
@@ -698,7 +698,7 @@ void SlaveSM::DoGetKey() {
msg.buffer_bytes = std::min(key.size() + 1,
static_cast<size_t>(kBufferSize));
memcpy(output_->buffer, key.c_str(), msg.buffer_bytes);
- if (msg.buffer_bytes != key.size() + 1) {
+ if (msg.buffer_bytes != static_cast<int32>(key.size() + 1)) {
// We don't support moving this entry. Just tell the master.
msg.result = RESULT_NAME_OVERFLOW;
} else {