net/http/http_response_headers.cc - Issue 8921006: Standardize StringToInt{,64} interface.

Unified Diff: net/http/http_response_headers.cc

Issue 8921006: Standardize StringToInt{,64} interface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Updated StringPiece constructor interface to use iterators. Created 9 years 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

Index: net/http/http_response_headers.cc

diff --git a/net/http/http_response_headers.cc b/net/http/http_response_headers.cc

index f249db88e236a4ea4ddd03f0397e401a046f71ea..23f2c75333a74c6f1e11459bc225ba92d592cba4 100644

--- a/net/http/http_response_headers.cc

+++ b/net/http/http_response_headers.cc

@@ -15,11 +15,13 @@

#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;

@@ -698,7 +700,8 @@ void HttpResponseHeaders::ParseStatusLine(

raw_headers_.push_back(' ');

raw_headers_.append(code, p);

raw_headers_.push_back(' ');

- base::StringToInt(code, p, &response_code_);

+ base::StringToInt(StringPiece(&(*code), (int)(p - code)),

erikwright (departed) 2011/12/13 20:20:45 Can't this be StringPiece(code, p), ...?

+ &response_code_);

// Skip whitespace.

while (*p == ' ')

@@ -1071,8 +1074,8 @@ bool HttpResponseHeaders::GetMaxAgeValue(TimeDelta* result) const {

value.begin() + kMaxAgePrefixLen,

kMaxAgePrefix)) {

int64 seconds;

- base::StringToInt64(value.begin() + kMaxAgePrefixLen,

- value.end(),

+ base::StringToInt64(StringPiece(value.begin() + kMaxAgePrefixLen,

+ value.end()),

&seconds);

*result = TimeDelta::FromSeconds(seconds);

return true;

@@ -1250,8 +1253,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(first_byte_pos_begin,

- first_byte_pos_end,

+ bool ok = base::StringToInt64(std::string(first_byte_pos_begin,

erikwright (departed) 2011/12/13 20:20:45 StringToInt64(StringPiece(first_byte_pos_begin, fi

+ first_byte_pos_end),

first_byte_position);

// Obtain last-byte-pos.

@@ -1261,8 +1264,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(last_byte_pos_begin,

- last_byte_pos_end,

+ ok &= base::StringToInt64(std::string(last_byte_pos_begin,

+ last_byte_pos_end),

erikwright (departed) 2011/12/13 20:20:45 Similar.

last_byte_position);

if (!ok) {

*first_byte_position = *last_byte_position = -1;

@@ -1286,8 +1289,8 @@ bool HttpResponseHeaders::GetContentRange(int64* first_byte_position,

if (LowerCaseEqualsASCII(instance_length_begin, instance_length_end, "*")) {

return false;

- } else if (!base::StringToInt64(instance_length_begin,

- instance_length_end,

+ } else if (!base::StringToInt64(std::string(instance_length_begin,

+ instance_length_end),

erikwright (departed) 2011/12/13 20:20:45 Similar.

instance_length)) {

*instance_length = -1;

return false;

« net/base/net_util.cc ('K') | « net/ftp/ftp_util.cc ('k') | net/proxy/proxy_bypass_rules.cc » ('j') | no next file with comments »