From 7e119b1cbde0de721717c31cf4892d9a116a89e1 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sat, 28 Feb 2026 22:56:48 -1000 Subject: [PATCH] Fix clang-tidy naming violations in lwip_raw_tcp_impl - Rename internal_write/internal_output to internal_write_/internal_output_ (protected methods require trailing underscore) - Fix getpeername/getsockname parameter name mismatch between .h and .cpp --- esphome/components/socket/lwip_raw_tcp_impl.cpp | 12 ++++++------ esphome/components/socket/lwip_raw_tcp_impl.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/esphome/components/socket/lwip_raw_tcp_impl.cpp b/esphome/components/socket/lwip_raw_tcp_impl.cpp index 7bf14f9e73..f887633278 100644 --- a/esphome/components/socket/lwip_raw_tcp_impl.cpp +++ b/esphome/components/socket/lwip_raw_tcp_impl.cpp @@ -441,7 +441,7 @@ ssize_t LWIPRawImpl::readv(const struct iovec *iov, int iovcnt) { return ret; } -ssize_t LWIPRawImpl::internal_write(const void *buf, size_t len) { +ssize_t LWIPRawImpl::internal_write_(const void *buf, size_t len) { if (this->pcb_ == nullptr) { errno = ECONNRESET; return -1; @@ -473,7 +473,7 @@ ssize_t LWIPRawImpl::internal_write(const void *buf, size_t len) { return to_send; } -int LWIPRawImpl::internal_output() { +int LWIPRawImpl::internal_output_() { LWIP_LOG("tcp_output(%p)", this->pcb_); err_t err = tcp_output(this->pcb_); if (err == ERR_ABRT) { @@ -489,7 +489,7 @@ int LWIPRawImpl::internal_output() { } ssize_t LWIPRawImpl::write(const void *buf, size_t len) { - ssize_t written = this->internal_write(buf, len); + ssize_t written = this->internal_write_(buf, len); if (written == -1) return -1; if (written == 0) { @@ -497,7 +497,7 @@ ssize_t LWIPRawImpl::write(const void *buf, size_t len) { return 0; } if (this->nodelay_) { - int err = this->internal_output(); + int err = this->internal_output_(); if (err == -1) return -1; } @@ -507,7 +507,7 @@ ssize_t LWIPRawImpl::write(const void *buf, size_t len) { ssize_t LWIPRawImpl::writev(const struct iovec *iov, int iovcnt) { ssize_t written = 0; for (int i = 0; i < iovcnt; i++) { - ssize_t err = this->internal_write(reinterpret_cast(iov[i].iov_base), iov[i].iov_len); + ssize_t err = this->internal_write_(reinterpret_cast(iov[i].iov_base), iov[i].iov_len); if (err == -1) { if (written != 0) { // if we already read some don't return an error @@ -524,7 +524,7 @@ ssize_t LWIPRawImpl::writev(const struct iovec *iov, int iovcnt) { return 0; } if (this->nodelay_) { - int err = this->internal_output(); + int err = this->internal_output_(); if (err == -1) return -1; } diff --git a/esphome/components/socket/lwip_raw_tcp_impl.h b/esphome/components/socket/lwip_raw_tcp_impl.h index 70f970b34a..2070f9c749 100644 --- a/esphome/components/socket/lwip_raw_tcp_impl.h +++ b/esphome/components/socket/lwip_raw_tcp_impl.h @@ -35,8 +35,8 @@ class LWIPRawCommon { int close(); int shutdown(int how); - int getpeername(struct sockaddr *addr, socklen_t *addrlen); - int getsockname(struct sockaddr *addr, socklen_t *addrlen); + int getpeername(struct sockaddr *name, socklen_t *addrlen); + int getsockname(struct sockaddr *name, socklen_t *addrlen); /// Format peer address into a fixed-size buffer (no heap allocation) size_t getpeername_to(std::span buf); @@ -112,8 +112,8 @@ class LWIPRawImpl : public LWIPRawCommon { static err_t s_recv_fn(void *arg, struct tcp_pcb *pcb, struct pbuf *pb, err_t err); protected: - ssize_t internal_write(const void *buf, size_t len); - int internal_output(); + ssize_t internal_write_(const void *buf, size_t len); + int internal_output_(); pbuf *rx_buf_ = nullptr; size_t rx_buf_offset_ = 0;