summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/base/net_util.cc4
-rw-r--r--net/base/x509_cert_types.cc4
-rw-r--r--net/ftp/ftp_ctrl_response_buffer.cc10
-rw-r--r--net/ftp/ftp_util.cc27
-rw-r--r--net/http/http_chunked_decoder.cc10
-rw-r--r--net/http/http_response_headers.cc20
-rw-r--r--net/proxy/proxy_bypass_rules.cc5
7 files changed, 34 insertions, 46 deletions
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 180a905..7ae4363d 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(base::StringPiece(allowed_ports.begin() + last,
- allowed_ports.begin() + i),
+ base::StringToInt(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 7578ccd..6beb3ec 100644
--- a/net/base/x509_cert_types.cc
+++ b/net/base/x509_cert_types.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-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.
@@ -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(base::StringPiece(*field, field_len), &result);
+ *ok &= base::StringToInt(*field, *field + field_len, &result);
*field += field_len;
return result;
}
diff --git a/net/ftp/ftp_ctrl_response_buffer.cc b/net/ftp/ftp_ctrl_response_buffer.cc
index 670c70d..4aeef1f 100644
--- a/net/ftp/ftp_ctrl_response_buffer.cc
+++ b/net/ftp/ftp_ctrl_response_buffer.cc
@@ -1,12 +1,11 @@
-// 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.
+// Copyright (c) 2009 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.
#include "net/ftp/ftp_ctrl_response_buffer.h"
#include "base/logging.h"
#include "base/string_number_conversions.h"
-#include "base/string_piece.h"
//#include "base/string_util.h"
#include "net/base/net_errors.h"
@@ -92,8 +91,7 @@ FtpCtrlResponseBuffer::ParsedLine FtpCtrlResponseBuffer::ParseLine(
ParsedLine result;
if (line.length() >= 3) {
- if (base::StringToInt(base::StringPiece(line.begin(), line.begin() + 3),
- &result.status_code))
+ if (base::StringToInt(line.begin(), line.begin() + 3, &result.status_code))
result.has_status_code = (100 <= result.status_code &&
result.status_code <= 599);
if (result.has_status_code && line.length() >= 4 && line[3] == ' ') {
diff --git a/net/ftp/ftp_util.cc b/net/ftp/ftp_util.cc
index f6bdf2f..553d513 100644
--- a/net/ftp/ftp_util.cc
+++ b/net/ftp/ftp_util.cc
@@ -12,7 +12,6 @@
#include "base/logging.h"
#include "base/memory/singleton.h"
#include "base/string_number_conversions.h"
-#include "base/string_piece.h"
#include "base/string_split.h"
#include "base/string_tokenizer.h"
#include "base/string_util.h"
@@ -22,8 +21,6 @@
#include "unicode/dtfmtsym.h"
#include "unicode/uchar.h"
-using base::StringPiece16;
-
// For examples of Unix<->VMS path conversions, see the unit test file. On VMS
// a path looks differently depending on whether it's a file or directory.
@@ -214,26 +211,26 @@ bool FtpUtil::LsDateListingToTime(const string16& month, const string16& day,
if (!base::StringToInt(rest, &time_exploded.year)) {
// Maybe it's time. Does it look like time (HH:MM)?
if (rest.length() == 5 && rest[2] == ':') {
- if (!base::StringToInt(StringPiece16(rest.begin(), rest.begin() + 2),
- &time_exploded.hour)) {
+ if (!base::StringToInt(rest.begin(),
+ rest.begin() + 2,
+ &time_exploded.hour))
return false;
- }
- if (!base::StringToInt(StringPiece16(rest.begin() + 3, rest.begin() + 5),
- &time_exploded.minute)) {
+ if (!base::StringToInt(rest.begin() + 3,
+ rest.begin() + 5,
+ &time_exploded.minute))
return false;
- }
} else if (rest.length() == 4 && rest[1] == ':') {
// Sometimes it's just H:MM.
- if (!base::StringToInt(StringPiece16(rest.begin(), rest.begin() + 1),
- &time_exploded.hour)) {
+ if (!base::StringToInt(rest.begin(),
+ rest.begin() + 1,
+ &time_exploded.hour))
return false;
- }
- if (!base::StringToInt(StringPiece16(rest.begin() + 2, rest.begin() + 4),
- &time_exploded.minute)) {
+ if (!base::StringToInt(rest.begin() + 2,
+ rest.begin() + 4,
+ &time_exploded.minute))
return false;
- }
} else {
return false;
}
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;
diff --git a/net/http/http_response_headers.cc b/net/http/http_response_headers.cc
index 98bd052..f249db8 100644
--- a/net/http/http_response_headers.cc
+++ b/net/http/http_response_headers.cc
@@ -15,13 +15,11 @@
#include "base/metrics/histogram.h"
#include "base/pickle.h"
#include "base/string_number_conversions.h"
-#include "base/string_piece.h"
#include "base/string_util.h"
#include "base/time.h"
#include "net/base/escape.h"
#include "net/http/http_util.h"
-using base::StringPiece;
using base::Time;
using base::TimeDelta;
@@ -700,7 +698,7 @@ void HttpResponseHeaders::ParseStatusLine(
raw_headers_.push_back(' ');
raw_headers_.append(code, p);
raw_headers_.push_back(' ');
- base::StringToInt(StringPiece(code, p), &response_code_);
+ base::StringToInt(code, p, &response_code_);
// Skip whitespace.
while (*p == ' ')
@@ -1073,8 +1071,8 @@ bool HttpResponseHeaders::GetMaxAgeValue(TimeDelta* result) const {
value.begin() + kMaxAgePrefixLen,
kMaxAgePrefix)) {
int64 seconds;
- base::StringToInt64(StringPiece(value.begin() + kMaxAgePrefixLen,
- value.end()),
+ base::StringToInt64(value.begin() + kMaxAgePrefixLen,
+ value.end(),
&seconds);
*result = TimeDelta::FromSeconds(seconds);
return true;
@@ -1252,8 +1250,8 @@ bool HttpResponseHeaders::GetContentRange(int64* first_byte_position,
byte_range_resp_spec.begin() + minus_position;
HttpUtil::TrimLWS(&first_byte_pos_begin, &first_byte_pos_end);
- bool ok = base::StringToInt64(StringPiece(first_byte_pos_begin,
- first_byte_pos_end),
+ bool ok = base::StringToInt64(first_byte_pos_begin,
+ first_byte_pos_end,
first_byte_position);
// Obtain last-byte-pos.
@@ -1263,8 +1261,8 @@ bool HttpResponseHeaders::GetContentRange(int64* first_byte_position,
byte_range_resp_spec.end();
HttpUtil::TrimLWS(&last_byte_pos_begin, &last_byte_pos_end);
- ok &= base::StringToInt64(StringPiece(last_byte_pos_begin,
- last_byte_pos_end),
+ ok &= base::StringToInt64(last_byte_pos_begin,
+ last_byte_pos_end,
last_byte_position);
if (!ok) {
*first_byte_position = *last_byte_position = -1;
@@ -1288,8 +1286,8 @@ bool HttpResponseHeaders::GetContentRange(int64* first_byte_position,
if (LowerCaseEqualsASCII(instance_length_begin, instance_length_end, "*")) {
return false;
- } else if (!base::StringToInt64(StringPiece(instance_length_begin,
- instance_length_end),
+ } else if (!base::StringToInt64(instance_length_begin,
+ instance_length_end,
instance_length)) {
*instance_length = -1;
return false;
diff --git a/net/proxy/proxy_bypass_rules.cc b/net/proxy/proxy_bypass_rules.cc
index 1c0fd61..3d622a8 100644
--- a/net/proxy/proxy_bypass_rules.cc
+++ b/net/proxy/proxy_bypass_rules.cc
@@ -7,7 +7,6 @@
#include "base/stl_util.h"
#include "base/stringprintf.h"
#include "base/string_number_conversions.h"
-#include "base/string_piece.h"
#include "base/string_tokenizer.h"
#include "base/string_util.h"
#include "net/base/net_util.h"
@@ -316,9 +315,7 @@ bool ProxyBypassRules::AddRuleFromStringInternal(
host = raw;
port = -1;
if (pos_colon != std::string::npos) {
- if (!base::StringToInt(base::StringPiece(raw.begin() + pos_colon + 1,
- raw.end()),
- &port) ||
+ if (!base::StringToInt(raw.begin() + pos_colon + 1, raw.end(), &port) ||
(port < 0 || port > 0xFFFF)) {
return false; // Port was invalid.
}
generated by cgit v1.1 at 2025-02-02 04:58:09 +0000