github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-06 19:06:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[api] Remove redundant frame_header_padding arg from write_plaintext_header

Browse Source 
It's always HEADER_PADDING (constexpr 6). Using it directly inside
the function eliminates an argument and lets the compiler constant-fold.
This commit is contained in:
J. Nick Koston
2026-03-29 14:33:51 -10:00
parent ccafd442a7
commit adf0ce7fbd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/api/api_frame_helper_plaintext.cpp
+4 -4
View File
@@ -236,8 +236,8 @@ APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) {
} }
// Write plaintext header into pre-allocated padding before payload. // Write plaintext header into pre-allocated padding before payload.
// Returns the total header length (indicator + varints). // Returns the total header length (indicator + varints).
ESPHOME_ALWAYS_INLINE static inline uint8_t write_plaintext_header(uint8_t *buf_start, const MessageInfo &msg, ESPHOME_ALWAYS_INLINE static inline uint8_t write_plaintext_header(uint8_t *buf_start, const MessageInfo &msg) {
uint8_t frame_header_padding) { constexpr uint8_t frame_header_padding = APIPlaintextFrameHelper::HEADER_PADDING;
// Calculate varint sizes for header layout using inline ternary to avoid varint_slow call overhead // Calculate varint sizes for header layout using inline ternary to avoid varint_slow call overhead
uint8_t size_varint_len = msg.payload_size < ProtoSize::VARINT_THRESHOLD_1_BYTE uint8_t size_varint_len = msg.payload_size < ProtoSize::VARINT_THRESHOLD_1_BYTE
? 1 ? 1
@@ -289,7 +289,7 @@ APIError APIPlaintextFrameHelper::write_protobuf_packet(uint8_t type, ProtoWrite
MessageInfo msg{type, 0, static_cast<uint16_t>(buffer.get_buffer()->size() - HEADER_PADDING)}; MessageInfo msg{type, 0, static_cast<uint16_t>(buffer.get_buffer()->size() - HEADER_PADDING)};
uint8_t *buffer_data = buffer.get_buffer()->data(); uint8_t *buffer_data = buffer.get_buffer()->data();
uint8_t header_len = write_plaintext_header(buffer_data, msg, HEADER_PADDING); uint8_t header_len = write_plaintext_header(buffer_data, msg);
uint8_t *msg_start = buffer_data + HEADER_PADDING - header_len; uint8_t *msg_start = buffer_data + HEADER_PADDING - header_len;
uint16_t msg_len = static_cast<uint16_t>(header_len + msg.payload_size); uint16_t msg_len = static_cast<uint16_t>(header_len + msg.payload_size);
LOG_PACKET_SENDING(msg_start, msg_len); LOG_PACKET_SENDING(msg_start, msg_len);
@@ -307,7 +307,7 @@ APIError APIPlaintextFrameHelper::write_protobuf_messages(ProtoWriteBuffer buffe
uint16_t total_write_len = 0; uint16_t total_write_len = 0;
for (const auto &msg : messages) { for (const auto &msg : messages) {
uint8_t header_len = write_plaintext_header(buffer_data + msg.offset, msg, HEADER_PADDING); uint8_t header_len = write_plaintext_header(buffer_data + msg.offset, msg);
uint8_t *msg_start = buffer_data + msg.offset + HEADER_PADDING - header_len; uint8_t *msg_start = buffer_data + msg.offset + HEADER_PADDING - header_len;
size_t msg_len = static_cast<size_t>(header_len + msg.payload_size); size_t msg_len = static_cast<size_t>(header_len + msg.payload_size);
iovs.push_back({msg_start, msg_len}); iovs.push_back({msg_start, msg_len});