diff options
author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-18 21:31:07 +0000 |
---|---|---|
committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-18 21:31:07 +0000 |
commit | d25fc23b5f78a579d534fb1d51f4e45a767ff2d8 (patch) | |
tree | 71a91ce2cea378cf20078b8e2bda1f4dae448c14 /net/http/http_chunked_decoder.cc | |
parent | ce87e24351c86bc40b32dca51fe2ebbabc603b1a (diff) | |
download | chromium_src-d25fc23b5f78a579d534fb1d51f4e45a767ff2d8.zip chromium_src-d25fc23b5f78a579d534fb1d51f4e45a767ff2d8.tar.gz chromium_src-d25fc23b5f78a579d534fb1d51f4e45a767ff2d8.tar.bz2 |
Revert 114944 - Standardize StringToInt{,64} interface.
Revert due to compile breakage on ChromeOS.
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=
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=114929
Review URL: http://codereview.chromium.org/8921006
TBR=tedvessenes@gmail.com
Review URL: http://codereview.chromium.org/8990002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_chunked_decoder.cc')
-rw-r--r-- | net/http/http_chunked_decoder.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/http/http_chunked_decoder.cc b/net/http/http_chunked_decoder.cc index 87f54640..d5b16dd 100644 --- a/net/http/http_chunked_decoder.cc +++ b/net/http/http_chunked_decoder.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 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. @@ -187,14 +187,12 @@ bool HttpChunkedDecoder::ParseChunkSize(const char* start, int len, int* out) { // Be more restrictive than HexStringToInt; // don't allow inputs with leading "-", "+", "0x", "0X" - base::StringPiece chunk_size(start, len); - if (chunk_size.find_first_not_of("0123456789abcdefABCDEF") - != base::StringPiece::npos) { + if (base::StringPiece(start, len).find_first_not_of("0123456789abcdefABCDEF") + != base::StringPiece::npos) return false; - } int parsed_number; - bool ok = base::HexStringToInt(chunk_size, &parsed_number); + bool ok = base::HexStringToInt(start, start + len, &parsed_number); if (ok && parsed_number >= 0) { *out = parsed_number; return true; |