Clean up SimpleStringBuilder after absl::string_view adoption
Bug: webrtc:13579
Change-Id: I8fdc65e19893c9a96b263bbc99c4f9139fa4b78f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256268
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Ali Tofigh <alito@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36291}
diff --git a/rtc_base/strings/string_builder.cc b/rtc_base/strings/string_builder.cc
index e3e25e6..a419b0b 100644
--- a/rtc_base/strings/string_builder.cc
+++ b/rtc_base/strings/string_builder.cc
@@ -28,11 +28,19 @@
}
SimpleStringBuilder& SimpleStringBuilder::operator<<(char ch) {
- return Append(&ch, 1);
+ return operator<<(absl::string_view(&ch, 1));
}
SimpleStringBuilder& SimpleStringBuilder::operator<<(absl::string_view str) {
- return Append(str.data(), str.length());
+ RTC_DCHECK_LT(size_ + str.length(), buffer_.size())
+ << "Buffer size was insufficient";
+ const size_t chars_added =
+ rtc::SafeMin(str.length(), buffer_.size() - size_ - 1);
+ memcpy(&buffer_[size_], str.data(), chars_added);
+ size_ += chars_added;
+ buffer_[size_] = '\0';
+ RTC_DCHECK(IsConsistent());
+ return *this;
}
// Numeric conversion routines.
@@ -103,18 +111,6 @@
return *this;
}
-SimpleStringBuilder& SimpleStringBuilder::Append(const char* str,
- size_t length) {
- RTC_DCHECK_LT(size_ + length, buffer_.size())
- << "Buffer size was insufficient";
- const size_t chars_added = rtc::SafeMin(length, buffer_.size() - size_ - 1);
- memcpy(&buffer_[size_], str, chars_added);
- size_ += chars_added;
- buffer_[size_] = '\0';
- RTC_DCHECK(IsConsistent());
- return *this;
-}
-
StringBuilder& StringBuilder::AppendFormat(const char* fmt, ...) {
va_list args, copy;
va_start(args, fmt);