Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Unified Diff: chrome_frame/html_utils.cc

Issue 2081007: Enable warning 4389 as an error on windows builds. This will make... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/function_stub_unittest.cc ('k') | chrome_frame/test/chrome_frame_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/html_utils.cc
===================================================================
--- chrome_frame/html_utils.cc (revision 48060)
+++ chrome_frame/html_utils.cc (working copy)
@@ -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.
//
@@ -342,15 +342,13 @@
} else if (SUCCEEDED(hr)) {
// Truncate the extra allocation.
DCHECK(size > 0); // NOLINT
- ret.resize(size - sizeof(char)); // NOLINT
+ ret.resize(size - 1); // NOLINT
}
}
if (FAILED(hr)) {
NOTREACHED() << StringPrintf("ObtainUserAgentString==0x%08X", hr);
- return "";
- } else {
- DCHECK(ret.length() == lstrlenA(ret.c_str()));
+ return std::string();
}
return ret;
@@ -362,7 +360,8 @@
while (it.GetNext()) {
if (lstrcmpiA(it.name().c_str(), kXFrameOptionsHeader) == 0) {
std::string allow_all(kXFrameOptionsValueAllowAll);
- if (it.values_end() - it.values_begin() != allow_all.length() ||
+ if (it.values_end() - it.values_begin() !=
+ static_cast<int>(allow_all.length()) ||
!std::equal(it.values_begin(), it.values_end(),
allow_all.begin(),
CaseInsensitiveCompareASCII<const char>())) {
« no previous file with comments | « chrome_frame/function_stub_unittest.cc ('k') | chrome_frame/test/chrome_frame_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698