From d2a31b95c4f0b8d2f095ad932e9f680dec404028 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sat, 11 Oct 2025 16:08:47 -1000 Subject: [PATCH] preen --- esphome/components/esp32_ble/ble.cpp | 6 +++--- esphome/components/ethernet/ethernet_component.cpp | 4 ++-- esphome/components/wifi/wifi_component.cpp | 4 ++-- esphome/core/application.h | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/esphome/components/esp32_ble/ble.cpp b/esphome/components/esp32_ble/ble.cpp index f23b9a02bd..55a80eccbb 100644 --- a/esphome/components/esp32_ble/ble.cpp +++ b/esphome/components/esp32_ble/ble.cpp @@ -218,10 +218,10 @@ bool ESP32BLE::ble_setup_() { name = this->name_.value(); if (App.is_name_add_mac_suffix_enabled()) { // MAC address suffix length (last 6 characters of 12-char MAC address string) - constexpr size_t MAC_ADDRESS_SUFFIX_LEN = 6; + constexpr size_t mac_address_suffix_len = 6; const std::string mac_addr = get_mac_address(); - const char *mac_suffix_ptr = mac_addr.c_str() + MAC_ADDRESS_SUFFIX_LEN; - name = make_name_with_suffix(name, '-', mac_suffix_ptr, MAC_ADDRESS_SUFFIX_LEN); + const char *mac_suffix_ptr = mac_addr.c_str() + mac_address_suffix_len; + name = make_name_with_suffix(name, '-', mac_suffix_ptr, mac_address_suffix_len); } } else { name = App.get_name(); diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp index 8257e37b52..13adab8815 100644 --- a/esphome/components/ethernet/ethernet_component.cpp +++ b/esphome/components/ethernet/ethernet_component.cpp @@ -692,8 +692,8 @@ void EthernetComponent::set_manual_ip(const ManualIP &manual_ip) { this->manual_ std::string EthernetComponent::get_use_address() const { if (this->use_address_.empty()) { // ".local" suffix length for mDNS hostnames - constexpr size_t MDNS_LOCAL_SUFFIX_LEN = 5; - return make_name_with_suffix(App.get_name(), '.', "local", MDNS_LOCAL_SUFFIX_LEN); + constexpr size_t mdns_local_suffix_len = 5; + return make_name_with_suffix(App.get_name(), '.', "local", mdns_local_suffix_len); } return this->use_address_; } diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp index db9b1d43fa..67d09118f9 100644 --- a/esphome/components/wifi/wifi_component.cpp +++ b/esphome/components/wifi/wifi_component.cpp @@ -268,8 +268,8 @@ network::IPAddress WiFiComponent::get_dns_address(int num) { std::string WiFiComponent::get_use_address() const { if (this->use_address_.empty()) { // ".local" suffix length for mDNS hostnames - constexpr size_t MDNS_LOCAL_SUFFIX_LEN = 5; - return make_name_with_suffix(App.get_name(), '.', "local", MDNS_LOCAL_SUFFIX_LEN); + constexpr size_t mdns_local_suffix_len = 5; + return make_name_with_suffix(App.get_name(), '.', "local", mdns_local_suffix_len); } return this->use_address_; } diff --git a/esphome/core/application.h b/esphome/core/application.h index 646c2376bb..b7d1948103 100644 --- a/esphome/core/application.h +++ b/esphome/core/application.h @@ -103,13 +103,13 @@ class Application { this->name_add_mac_suffix_ = name_add_mac_suffix; if (name_add_mac_suffix) { // MAC address suffix length (last 6 characters of 12-char MAC address string) - constexpr size_t MAC_ADDRESS_SUFFIX_LEN = 6; + constexpr size_t mac_address_suffix_len = 6; const std::string mac_addr = get_mac_address(); // Use pointer + offset to avoid substr() allocation - const char *mac_suffix_ptr = mac_addr.c_str() + MAC_ADDRESS_SUFFIX_LEN; - this->name_ = make_name_with_suffix(name, '-', mac_suffix_ptr, MAC_ADDRESS_SUFFIX_LEN); + const char *mac_suffix_ptr = mac_addr.c_str() + mac_address_suffix_len; + this->name_ = make_name_with_suffix(name, '-', mac_suffix_ptr, mac_address_suffix_len); if (!friendly_name.empty()) { - this->friendly_name_ = make_name_with_suffix(friendly_name, ' ', mac_suffix_ptr, MAC_ADDRESS_SUFFIX_LEN); + this->friendly_name_ = make_name_with_suffix(friendly_name, ' ', mac_suffix_ptr, mac_address_suffix_len); } } else { this->name_ = name;