From 7a364ff63a9e4e99215f9dcb2b26e3de29543693 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 15 May 2025 12:52:25 -0500 Subject: [PATCH] cleanup --- esphome/components/api/api_frame_helper.cpp | 22 ++++----------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/esphome/components/api/api_frame_helper.cpp b/esphome/components/api/api_frame_helper.cpp index 33b72acfe7..98dd6326f0 100644 --- a/esphome/components/api/api_frame_helper.cpp +++ b/esphome/components/api/api_frame_helper.cpp @@ -268,15 +268,8 @@ APIError APINoiseFrameHelper::try_read_frame_(ParsedFrame *frame) { } // Only check for available data when starting a new frame read - if (rx_header_buf_len_ == 0) { - ssize_t available = socket_->available(); - if (available == 0) { - return APIError::WOULD_BLOCK; - } else if (available == -1) { - state_ = State::FAILED; - HELPER_LOG("Socket available failed with errno %d", errno); - return APIError::SOCKET_READ_FAILED; - } + if (rx_header_buf_len_ == 0 && socket_->available() == 0) { + return APIError::WOULD_BLOCK; } // read header @@ -840,15 +833,8 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) { } // Only check for available data when starting a new frame read - if (rx_header_buf_pos_ == 0) { - ssize_t available = socket_->available(); - if (available == 0) { - return APIError::WOULD_BLOCK; - } else if (available == -1) { - state_ = State::FAILED; - HELPER_LOG("Socket read_available failed with errno %d", errno); - return APIError::SOCKET_READ_FAILED; - } + if (rx_header_buf_pos_ == 0 && socket_->available() == 0) { + return APIError::WOULD_BLOCK; } // read header