Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-06-01 17:57:37 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

[core] Use MAC_ADDRESS_BUFFER_SIZE constant instead of duplicated literal (#15913)

Browse Source
This commit is contained in:
J. Nick Koston
2026-04-22 06:43:33 +02:00
committed by GitHub
parent 9c80cbf19c
commit a3b49d1ed9
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/esp32_ble/ble.cpp
+1 -3
View File
@@ -257,11 +257,9 @@ bool ESP32BLE::ble_setup_() {
if (this->name_ != nullptr) { if (this->name_ != nullptr) {
if (App.is_name_add_mac_suffix_enabled()) { if (App.is_name_add_mac_suffix_enabled()) {
// MAC address length: 12 hex chars + null terminator
constexpr size_t mac_address_len = 13;
// MAC address suffix length (last 6 characters of 12-char MAC address string) // 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;
char mac_addr[mac_address_len]; char mac_addr[MAC_ADDRESS_BUFFER_SIZE];
get_mac_address_into_buffer(mac_addr); get_mac_address_into_buffer(mac_addr);
const char *mac_suffix_ptr = mac_addr + mac_address_suffix_len; const char *mac_suffix_ptr = mac_addr + mac_address_suffix_len;
make_name_with_suffix_to(name_buffer, sizeof(name_buffer), this->name_, strlen(this->name_), '-', mac_suffix_ptr, make_name_with_suffix_to(name_buffer, sizeof(name_buffer), this->name_, strlen(this->name_), '-', mac_suffix_ptr,
esphome/core/application.h
+1 -3
View File
@@ -82,11 +82,9 @@ class Application {
void pre_setup(char *name, size_t name_len, char *friendly_name, size_t friendly_name_len) { void pre_setup(char *name, size_t name_len, char *friendly_name, size_t friendly_name_len) {
arch_init(); arch_init();
this->name_add_mac_suffix_ = true; this->name_add_mac_suffix_ = true;
// MAC address length: 12 hex chars + null terminator
constexpr size_t mac_address_len = 13;
// MAC address suffix length (last 6 characters of 12-char MAC address string) // 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;
char mac_addr[mac_address_len]; char mac_addr[MAC_ADDRESS_BUFFER_SIZE];
get_mac_address_into_buffer(mac_addr); get_mac_address_into_buffer(mac_addr);
// Overwrite the placeholder suffix in the mutable static buffers with actual MAC // Overwrite the placeholder suffix in the mutable static buffers with actual MAC
// name is always non-empty (validated by validate_hostname in Python config) // name is always non-empty (validated by validate_hostname in Python config)