From 7b88b8eb4f5373e7b13924b5a880f9ed63e4a5fb Mon Sep 17 00:00:00 2001 From: Oliver Kleinecke Date: Tue, 18 Feb 2025 16:57:52 +0100 Subject: [PATCH] fix: streamline lamp list initialization in build_lamp_list_from_list_str_ to avoid redundant declarations --- esphome/components/dynamic_lamp/dynamic_lamp.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/esphome/components/dynamic_lamp/dynamic_lamp.cpp b/esphome/components/dynamic_lamp/dynamic_lamp.cpp index f59ab05a92..8ffd70720b 100644 --- a/esphome/components/dynamic_lamp/dynamic_lamp.cpp +++ b/esphome/components/dynamic_lamp/dynamic_lamp.cpp @@ -270,23 +270,19 @@ bool DynamicLampComponent::add_timer(std::string lamp_list_str, bool timer_activ LampList DynamicLampComponent::build_lamp_list_from_list_str_(std::string lamp_list_str) { std::string delimiter = ","; std::vector lamp_list_vector = this->split_to_int_array_(s, delimiter); + LampList lamp_list; + lamp_list[0] = 0; + lamp_list[1] = 0; if (lamp_list_vector.size() > 16) { ESP_LOGW(TAG, "Too many lamps in list, only 16 supported!"); this->status_set_warning(); - LampList lamp_list; - lamp_list[0] = 0; - lamp_list[1] = 0; - return lamp_list(); - } - LampList lamp_list; + return lamp_list; + } for (uint8_t i = 0; i < lamp_list_vector.size(); i++) { if (lamp_list_vector[i] > 15) { ESP_LOGW(TAG, "Lamp index %" PRIu8 " is out of range, only [0-15] supported!", lamp_list_vector[i]); this->status_set_warning(); - LampList lamp_list; - lamp_list[0] = 0; - lamp_list[1] = 0; - return lamp_list(); + return lamp_list; } switch (lamp_list_vector[i]) { case 0: