github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-25 05:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/proto-byte-buffer' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-07 13:29:13 -10:00
parent 76dd72e162 9e082edecb
commit 06525e14d7
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/api/proto.cpp
+8
View File
@@ -8,6 +8,14 @@ namespace esphome::api {
static const char *const TAG = "api.proto";
void ProtoByteBuffer::grow_(size_t n) {
auto new_data = make_buffer(n);
if (this->size_)
std::memcpy(new_data.get(), this->data_.get(), this->size_);
this->data_ = std::move(new_data);
this->capacity_ = n;
}
#ifdef USE_API_VARINT64
optional<ProtoVarInt> ProtoVarInt::parse_wide(const uint8_t *buffer, uint32_t len, uint32_t *consumed,
uint32_t result32) {
esphome/components/api/proto.h
+4 -8
View File
@@ -260,17 +260,12 @@ class ProtoByteBuffer {
public:
void clear() { this->size_ = 0; }
void reserve(size_t n) {
if (n > this->capacity_) {
auto new_data = make_buffer(n);
if (this->size_)
std::memcpy(new_data.get(), this->data_.get(), this->size_);
this->data_ = std::move(new_data);
this->capacity_ = n;
}
if (n > this->capacity_)
this->grow_(n);
}
void resize(size_t n) {
if (n > this->capacity_)
this->reserve(n);
this->grow_(n);
this->size_ = n; // no zero-fill
}
uint8_t *data() { return this->data_.get(); }
@@ -278,6 +273,7 @@ class ProtoByteBuffer {
size_t size() const { return this->size_; }
protected:
void grow_(size_t n);
std::unique_ptr<uint8_t[]> data_;
size_t size_{0};
size_t capacity_{0};