From 371070ab78193d48c7a47dd0079b9cd2f11578af Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 29 Mar 2026 11:42:42 -1000 Subject: [PATCH] [api] Default sent=-1 in write_raw_ for cleaner cold path call sites --- esphome/components/api/api_frame_helper.h | 2 +- esphome/components/api/api_frame_helper_noise.cpp | 4 ++-- esphome/components/api/api_frame_helper_plaintext.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/esphome/components/api/api_frame_helper.h b/esphome/components/api/api_frame_helper.h index 7d6499dea94..f93b0861860 100644 --- a/esphome/components/api/api_frame_helper.h +++ b/esphome/components/api/api_frame_helper.h @@ -214,7 +214,7 @@ class APIFrameHelper { } // Slow path (out-of-line): handle partial writes, errors, overflow buffering - APIError write_raw_(const struct iovec *iov, int iovcnt, uint16_t total_write_len, ssize_t sent); + APIError write_raw_(const struct iovec *iov, int iovcnt, uint16_t total_write_len, ssize_t sent = -1); // Socket ownership (4 bytes on 32-bit, 8 bytes on 64-bit) std::unique_ptr socket_; diff --git a/esphome/components/api/api_frame_helper_noise.cpp b/esphome/components/api/api_frame_helper_noise.cpp index 0a5e6fe085c..429f6fde1fa 100644 --- a/esphome/components/api/api_frame_helper_noise.cpp +++ b/esphome/components/api/api_frame_helper_noise.cpp @@ -541,7 +541,7 @@ APIError APINoiseFrameHelper::write_frame_(const uint8_t *data, uint16_t len) { if (len == 0) { struct iovec iov = {header, 3}; - return this->write_raw_(&iov, 1, 3, -1); + return this->write_raw_(&iov, 1, 3); } struct iovec iov[2]; iov[0].iov_base = header; @@ -549,7 +549,7 @@ APIError APINoiseFrameHelper::write_frame_(const uint8_t *data, uint16_t len) { iov[1].iov_base = const_cast(data); iov[1].iov_len = len; - return this->write_raw_(iov, 2, 3 + len, -1); + return this->write_raw_(iov, 2, 3 + len); } /** Initiate the data structures for the handshake. diff --git a/esphome/components/api/api_frame_helper_plaintext.cpp b/esphome/components/api/api_frame_helper_plaintext.cpp index 2207f4e15fc..6e33f681540 100644 --- a/esphome/components/api/api_frame_helper_plaintext.cpp +++ b/esphome/components/api/api_frame_helper_plaintext.cpp @@ -220,12 +220,12 @@ APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) { char msg[INDICATOR_MSG_SIZE]; memcpy_P(msg, MSG_PROGMEM, INDICATOR_MSG_SIZE); struct iovec iov = {msg, INDICATOR_MSG_SIZE}; - this->write_raw_(&iov, 1, INDICATOR_MSG_SIZE, -1); + this->write_raw_(&iov, 1, INDICATOR_MSG_SIZE); #else static const char MSG[] = "\x00" "Bad indicator byte"; struct iovec iov = {const_cast(MSG), INDICATOR_MSG_SIZE}; - this->write_raw_(&iov, 1, INDICATOR_MSG_SIZE, -1); + this->write_raw_(&iov, 1, INDICATOR_MSG_SIZE); #endif } return aerr;