summaryrefslogtreecommitdiffstats
path: root/net/tools/flip_server
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-11-25 19:40:10 +0000
committerBen Murdoch <benm@google.com>2010-12-03 13:52:53 +0000
commit4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 (patch)
tree938665d93a11fe7a6d0124e3c1e020d1f9d3f947 /net/tools/flip_server
parent7c627d87728a355737862918d144f98f69406954 (diff)
downloadexternal_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.zip
external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.gz
external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.bz2
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
Diffstat (limited to 'net/tools/flip_server')
-rw-r--r--net/tools/flip_server/balsa_headers.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/net/tools/flip_server/balsa_headers.cc b/net/tools/flip_server/balsa_headers.cc
index dfdbb61..2196cd4 100644
--- a/net/tools/flip_server/balsa_headers.cc
+++ b/net/tools/flip_server/balsa_headers.cc
@@ -555,22 +555,23 @@ void BalsaHeaders::DumpToString(std::string* str) const {
// Then check whether the header is in a partially parsed state. If so, just
// dump the raw data.
if (balsa_buffer_.can_write_to_contiguous_buffer()) {
- StringAppendF(str, "\n<incomplete header len: %d>\n%.*s\n",
- buffer_length, buffer_length, OriginalHeaderStreamBegin());
+ base::StringAppendF(str, "\n<incomplete header len: %d>\n%.*s\n",
+ buffer_length, buffer_length,
+ OriginalHeaderStreamBegin());
return;
}
// If the header is complete, then just dump them with the logical key value
// pair.
str->reserve(str->size() + GetSizeForWriteBuffer());
- StringAppendF(str, "\n %.*s\n",
- static_cast<int>(firstline.size()),
- firstline.data());
+ base::StringAppendF(str, "\n %.*s\n",
+ static_cast<int>(firstline.size()),
+ firstline.data());
BalsaHeaders::const_header_lines_iterator i = header_lines_begin();
for (; i != header_lines_end(); ++i) {
- StringAppendF(str, " %.*s: %.*s\n",
- static_cast<int>(i->first.size()), i->first.data(),
- static_cast<int>(i->second.size()), i->second.data());
+ base::StringAppendF(str, " %.*s: %.*s\n",
+ static_cast<int>(i->first.size()), i->first.data(),
+ static_cast<int>(i->second.size()), i->second.data());
}
}