Fix MemoryLogWriter so that it always writes the full data.
Also remove some unused and unnecessary constructors from MemoryStream.
Bug: webrtc:11053
Change-Id: I840820d5c8e9dd987e35db8abce9c51d55c450a5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/158280
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29614}
diff --git a/rtc_base/memory_stream.cc b/rtc_base/memory_stream.cc
index ed9c14a..94d31ad 100644
--- a/rtc_base/memory_stream.cc
+++ b/rtc_base/memory_stream.cc
@@ -111,14 +111,6 @@
MemoryStream::MemoryStream() {}
-MemoryStream::MemoryStream(const char* data) {
- SetData(data, strlen(data));
-}
-
-MemoryStream::MemoryStream(const void* data, size_t length) {
- SetData(data, length);
-}
-
MemoryStream::~MemoryStream() {
delete[] buffer_;
}
diff --git a/rtc_base/memory_stream.h b/rtc_base/memory_stream.h
index bdcc40d..7deb4b3 100644
--- a/rtc_base/memory_stream.h
+++ b/rtc_base/memory_stream.h
@@ -22,8 +22,6 @@
class MemoryStream final : public StreamInterface {
public:
MemoryStream();
- explicit MemoryStream(const char* data); // Calls SetData(data, strlen(data))
- MemoryStream(const void* data, size_t length); // Calls SetData(data, length)
~MemoryStream() override;
StreamState GetState() const override;
diff --git a/test/logging/memory_log_writer.cc b/test/logging/memory_log_writer.cc
index ee9befe..2eb1cff 100644
--- a/test/logging/memory_log_writer.cc
+++ b/test/logging/memory_log_writer.cc
@@ -30,8 +30,9 @@
bool Write(const std::string& value) override {
size_t written;
int error;
- return buffer_.Write(value.data(), value.size(), &written, &error) ==
+ return buffer_.WriteAll(value.data(), value.size(), &written, &error) ==
rtc::SR_SUCCESS;
+ RTC_DCHECK_EQ(value.size(), written);
}
void Flush() override {}