diff options
| author | tedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-17 21:35:27 +0000 |
|---|---|---|
| committer | tedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-17 21:35:27 +0000 |
| commit | 31d5661563a8dafc0409cf677a4e149c08ddb770 (patch) | |
| tree | 602724525407700923eaca5e3f9b9e01bff5c016 /net/base | |
| parent | 3acc642339a305cb5fd1f3f3b485c3df2bfd4155 (diff) | |
| download | chromium_src-31d5661563a8dafc0409cf677a4e149c08ddb770.zip chromium_src-31d5661563a8dafc0409cf677a4e149c08ddb770.tar.gz chromium_src-31d5661563a8dafc0409cf677a4e149c08ddb770.tar.bz2 | |
Standardize StringToInt{,64} interface.
These changes address issue #106655. All variants of StringToInt have been
converted to use the StringPiece class. One instance of conversion, in
chrome/browser/history/text_database.cc, required copying an underlying
string. This is because the string type in question could use 8 or 16
bit characters depending on the OS type, and because StringPiece is not
implemented as a template, the code cannot specify whether to create a
StringPiece or StringPiece16. This should be remedied in a future CL.
R=erikwright@chromium.org
BUG=106655
TEST=
Review URL: http://codereview.chromium.org/8921006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/net_util.cc | 4 | ||||
| -rw-r--r-- | net/base/x509_cert_types.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 7ae4363d..180a905 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -1985,8 +1985,8 @@ void SetExplicitlyAllowedPorts(const std::string& allowed_ports) { if (i == size || allowed_ports[i] == kComma) { if (i > last) { int port; - base::StringToInt(allowed_ports.begin() + last, - allowed_ports.begin() + i, + base::StringToInt(base::StringPiece(allowed_ports.begin() + last, + allowed_ports.begin() + i), &port); ports.insert(port); } diff --git a/net/base/x509_cert_types.cc b/net/base/x509_cert_types.cc index 6beb3ec..7578ccd 100644 --- a/net/base/x509_cert_types.cc +++ b/net/base/x509_cert_types.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -20,7 +20,7 @@ namespace { // untouched otherwise. Returns the parsed integer. int ParseIntAndAdvance(const char** field, size_t field_len, bool* ok) { int result = 0; - *ok &= base::StringToInt(*field, *field + field_len, &result); + *ok &= base::StringToInt(base::StringPiece(*field, field_len), &result); *field += field_len; return result; } |