admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete always-zero ByteBufferWriter::start_.

Browse Source 
Likely a left-over since cl https://codereview.webrtc.org/1821083002

BUG=None

Review-Url: https://codereview.webrtc.org/2440083002
Cr-Commit-Position: refs/heads/master@{#14732}
This commit is contained in:
nisse 2016-10-24 01:06:14 -07:00 committed by Commit bot
parent 61c053e329
commit d3c40089fa
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc/base/bytebuffer.cc
View File

@ -43,7 +43,6 @@ ByteBufferWriter::ByteBufferWriter(const char* bytes, size_t len,
}
void ByteBufferWriter::Construct(const char* bytes, size_t len) {
start_ = 0;
size_ = len;
bytes_ = new char[size_];
@ -119,25 +118,21 @@ char* ByteBufferWriter::ReserveWriteBuffer(size_t len) {
}
void ByteBufferWriter::Resize(size_t size) {
size_t len = std::min(end_ - start_, size);
if (size <= size_) {
// Don't reallocate, just move data backwards
memmove(bytes_, bytes_ + start_, len);
} else {
size_t len = std::min(end_, size);
if (size > size_) {
// Reallocate a larger buffer.
size_ = std::max(size, 3 * size_ / 2);
char* new_bytes = new char[size_];
memcpy(new_bytes, bytes_ + start_, len);
memcpy(new_bytes, bytes_, len);
delete [] bytes_;
bytes_ = new_bytes;
}
start_ = 0;
end_ = len;
}
void ByteBufferWriter::Clear() {
memset(bytes_, 0, size_);
start_ = end_ = 0;
end_ = 0;
}

7
webrtc/base/bytebuffer.h
View File

@ -46,9 +46,9 @@ class ByteBufferWriter : public ByteBuffer {
~ByteBufferWriter();
const char* Data() const { return bytes_ + start_; }
size_t Length() const { return end_ - start_; }
size_t Capacity() const { return size_ - start_; }
const char* Data() const { return bytes_; }
size_t Length() const { return end_; }
size_t Capacity() const { return size_; }
// Write value to the buffer. Resizes the buffer when it is
// neccessary.
@ -77,7 +77,6 @@ class ByteBufferWriter : public ByteBuffer {
char* bytes_;
size_t size_;
size_t start_;
size_t end_;
// There are sensible ways to define these, but they aren't needed in our code