cleanup

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ ci:
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.14.13
+    rev: v0.14.11
     hooks:
       # Run the linter.
       - id: ruff

esphome/components/mapping/mapping.h

@@ -2,7 +2,6 @@
 
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
-#include <cinttypes>
 #include <map>
 #include <string>
 
@@ -44,17 +43,8 @@ template<typename K, typename V> class Mapping {
       esph_log_e(TAG, "Key '%p' not found in mapping", key);
     } else if constexpr (std::is_same_v<K, std::string>) {
       esph_log_e(TAG, "Key '%s' not found in mapping", key.c_str());
-    } else if constexpr (std::is_integral_v<K>) {
-      char buf[24];  // enough for 64-bit integer
-      if constexpr (std::is_unsigned_v<K>) {
-        buf_append_printf(buf, sizeof(buf), 0, "%" PRIu64, static_cast<uint64_t>(key));
-      } else {
-        buf_append_printf(buf, sizeof(buf), 0, "%" PRId64, static_cast<int64_t>(key));
-      }
-      esph_log_e(TAG, "Key '%s' not found in mapping", buf);
     } else {
-      // All supported key types are handled above - this should never be reached
-      static_assert(sizeof(K) == 0, "Unsupported key type for Mapping error logging");
+      esph_log_e(TAG, "Key '%s' not found in mapping", to_string(key).c_str());
     }
     return {};
   }

esphome/components/remote_base/aeha_protocol.cpp

@@ -85,8 +85,8 @@ optional<AEHAData> AEHAProtocol::decode(RemoteReceiveData src) {
 std::string AEHAProtocol::format_data_(const std::vector<uint8_t> &data) {
   std::string out;
   for (uint8_t byte : data) {
-    char buf[8];  // "0x%02X," = 5 chars + null + margin
-    snprintf(buf, sizeof(buf), "0x%02X,", byte);
+    char buf[6];
+    sprintf(buf, "0x%02X,", byte);
     out += buf;
   }
   out.pop_back();

esphome/components/remote_base/raw_protocol.cpp

@@ -1,5 +1,4 @@
 #include "raw_protocol.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
 namespace esphome {
@@ -9,30 +8,36 @@ static const char *const TAG = "remote.raw";
 
 bool RawDumper::dump(RemoteReceiveData src) {
   char buffer[256];
-  size_t pos = buf_append_printf(buffer, sizeof(buffer), 0, "Received Raw: ");
+  uint32_t buffer_offset = 0;
+  buffer_offset += sprintf(buffer, "Received Raw: ");
 
   for (int32_t i = 0; i < src.size() - 1; i++) {
     const int32_t value = src[i];
-    size_t prev_pos = pos;
+    const uint32_t remaining_length = sizeof(buffer) - buffer_offset;
+    int written;
 
     if (i + 1 < src.size() - 1) {
-      pos = buf_append_printf(buffer, sizeof(buffer), pos, "%" PRId32 ", ", value);
+      written = snprintf(buffer + buffer_offset, remaining_length, "%" PRId32 ", ", value);
     } else {
-      pos = buf_append_printf(buffer, sizeof(buffer), pos, "%" PRId32, value);
+      written = snprintf(buffer + buffer_offset, remaining_length, "%" PRId32, value);
     }
 
-    if (pos >= sizeof(buffer) - 1) {
-      // buffer full, flush and continue
-      buffer[prev_pos] = '\0';
+    if (written < 0 || written >= int(remaining_length)) {
+      // write failed, flush...
+      buffer[buffer_offset] = '\0';
       ESP_LOGI(TAG, "%s", buffer);
+      buffer_offset = 0;
+      written = sprintf(buffer, "  ");
       if (i + 1 < src.size() - 1) {
-        pos = buf_append_printf(buffer, sizeof(buffer), 0, "  %" PRId32 ", ", value);
+        written += sprintf(buffer + written, "%" PRId32 ", ", value);
       } else {
-        pos = buf_append_printf(buffer, sizeof(buffer), 0, "  %" PRId32, value);
+        written += sprintf(buffer + written, "%" PRId32, value);
       }
     }
+
+    buffer_offset += written;
   }
-  if (pos != 0) {
+  if (buffer_offset != 0) {
     ESP_LOGI(TAG, "%s", buffer);
   }
   return true;

esphome/components/remote_base/remote_base.cpp

@@ -1,5 +1,4 @@
 #include "remote_base.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
 #include <cinttypes>
@@ -170,31 +169,36 @@ void RemoteTransmitterBase::send_(uint32_t send_times, uint32_t send_wait) {
 #ifdef ESPHOME_LOG_HAS_VERY_VERBOSE
   const auto &vec = this->temp_.get_data();
   char buffer[256];
-  size_t pos = buf_append_printf(buffer, sizeof(buffer), 0,
-                                 "Sending times=%" PRIu32 " wait=%" PRIu32 "ms: ", send_times, send_wait);
+  uint32_t buffer_offset = 0;
+  buffer_offset += sprintf(buffer, "Sending times=%" PRIu32 " wait=%" PRIu32 "ms: ", send_times, send_wait);
 
   for (size_t i = 0; i < vec.size(); i++) {
     const int32_t value = vec[i];
-    size_t prev_pos = pos;
+    const uint32_t remaining_length = sizeof(buffer) - buffer_offset;
+    int written;
 
     if (i + 1 < vec.size()) {
-      pos = buf_append_printf(buffer, sizeof(buffer), pos, "%" PRId32 ", ", value);
+      written = snprintf(buffer + buffer_offset, remaining_length, "%" PRId32 ", ", value);
     } else {
-      pos = buf_append_printf(buffer, sizeof(buffer), pos, "%" PRId32, value);
+      written = snprintf(buffer + buffer_offset, remaining_length, "%" PRId32, value);
     }
 
-    if (pos >= sizeof(buffer) - 1) {
-      // buffer full, flush and continue
-      buffer[prev_pos] = '\0';
+    if (written < 0 || written >= int(remaining_length)) {
+      // write failed, flush...
+      buffer[buffer_offset] = '\0';
       ESP_LOGVV(TAG, "%s", buffer);
+      buffer_offset = 0;
+      written = sprintf(buffer, "  ");
       if (i + 1 < vec.size()) {
-        pos = buf_append_printf(buffer, sizeof(buffer), 0, "  %" PRId32 ", ", value);
+        written += sprintf(buffer + written, "%" PRId32 ", ", value);
       } else {
-        pos = buf_append_printf(buffer, sizeof(buffer), 0, "  %" PRId32, value);
+        written += sprintf(buffer + written, "%" PRId32, value);
       }
     }
+
+    buffer_offset += written;
   }
-  if (pos != 0) {
+  if (buffer_offset != 0) {
     ESP_LOGVV(TAG, "%s", buffer);
   }
 #endif

esphome/components/select/__init__.py

@@ -8,20 +8,17 @@ from esphome.const import (
     CONF_ICON,
     CONF_ID,
     CONF_INDEX,
-    CONF_LAMBDA,
     CONF_MODE,
     CONF_MQTT_ID,
     CONF_ON_VALUE,
     CONF_OPERATION,
     CONF_OPTION,
-    CONF_OPTIONS,
     CONF_TRIGGER_ID,
     CONF_WEB_SERVER,
 )
-from esphome.core import CORE, ID, CoroPriority, coroutine_with_priority
+from esphome.core import CORE, CoroPriority, coroutine_with_priority
 from esphome.core.entity_helpers import entity_duplicate_validator, setup_entity
-from esphome.cpp_generator import MockObjClass, TemplateArguments
-from esphome.cpp_types import global_ns
+from esphome.cpp_generator import MockObjClass
 
 CODEOWNERS = ["@esphome/core"]
 IS_PLATFORM_COMPONENT = True
@@ -41,9 +38,6 @@ SelectSetAction = select_ns.class_("SelectSetAction", automation.Action)
 SelectSetIndexAction = select_ns.class_("SelectSetIndexAction", automation.Action)
 SelectOperationAction = select_ns.class_("SelectOperationAction", automation.Action)
 
-# Conditions
-SelectIsCondition = select_ns.class_("SelectIsCondition", automation.Condition)
-
 # Enums
 SelectOperation = select_ns.enum("SelectOperation")
 SELECT_OPERATION_OPTIONS = {
@@ -171,41 +165,6 @@ async def select_set_index_to_code(config, action_id, template_arg, args):
     return var
 
 
-@automation.register_condition(
-    "select.is",
-    SelectIsCondition,
-    OPERATION_BASE_SCHEMA.extend(
-        {
-            cv.Optional(CONF_OPTIONS): cv.All(
-                cv.ensure_list(cv.string_strict), cv.Length(min=1)
-            ),
-            cv.Optional(CONF_LAMBDA): cv.returning_lambda,
-        }
-    ).add_extra(cv.has_exactly_one_key(CONF_OPTIONS, CONF_LAMBDA)),
-)
-async def select_is_to_code(config, condition_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    if options := config.get(CONF_OPTIONS):
-        # List of constant options
-        # Create a constexpr and pass that with a template length
-        arr_id = ID(
-            f"{condition_id}_data",
-            is_declaration=True,
-            type=global_ns.namespace("constexpr char * const"),
-        )
-        arg = cg.static_const_array(arr_id, cg.ArrayInitializer(*options))
-        template_arg = TemplateArguments(len(options), *template_arg)
-    else:
-        # Lambda
-        arg = await cg.process_lambda(
-            config[CONF_LAMBDA],
-            [(global_ns.namespace("StringRef &").operator("const"), "current")] + args,
-            return_type=cg.bool_,
-        )
-        template_arg = TemplateArguments(0, *template_arg)
-    return cg.new_Pvariable(condition_id, template_arg, paren, arg)
-
-
 @automation.register_action(
     "select.operation",
     SelectOperationAction,

esphome/components/select/automation.h

@@ -66,34 +66,4 @@ template<typename... Ts> class SelectOperationAction : public Action<Ts...> {
   Select *select_;
 };
 
-template<size_t N, typename... Ts> class SelectIsCondition : public Condition<Ts...> {
- public:
-  SelectIsCondition(Select *parent, const char *const *option_list) : parent_(parent), option_list_(option_list) {}
-
-  bool check(const Ts &...x) override {
-    auto current = this->parent_->current_option();
-    for (size_t i = 0; i != N; i++) {
-      if (current == this->option_list_[i]) {
-        return true;
-      }
-    }
-    return false;
-  }
-
- protected:
-  Select *parent_;
-  const char *const *option_list_;
-};
-
-template<typename... Ts> class SelectIsCondition<0, Ts...> : public Condition<Ts...> {
- public:
-  SelectIsCondition(Select *parent, std::function<bool(const StringRef &, const Ts &...)> &&f)
-      : parent_(parent), f_(f) {}
-
-  bool check(const Ts &...x) override { return this->f_(this->parent_->current_option(), x...); }
-
- protected:
-  Select *parent_;
-  std::function<bool(const StringRef &, const Ts &...)> f_;
-};
 }  // namespace esphome::select

esphome/components/syslog/esphome_syslog.cpp

@@ -47,29 +47,27 @@ void Syslog::log_(const int level, const char *tag, const char *message, size_t
   size_t remaining = sizeof(packet);
 
   // Write PRI - abort if this fails as packet would be malformed
-  int ret = snprintf(packet, remaining, "<%d>", pri);
-  if (ret <= 0 || static_cast<size_t>(ret) >= remaining) {
-    return;
+  offset = buf_append_printf(packet, sizeof(packet), 0, "<%d>", pri);
+  if (offset == 0) {
+    return;  // PRI always produces at least "<0>" (3 chars), so 0 means error
   }
-  offset = ret;
-  remaining -= ret;
+  remaining -= offset;
 
   // Write timestamp directly into packet (RFC 5424: use "-" if time not valid or strftime fails)
   auto now = this->time_->now();
   size_t ts_written = now.is_valid() ? now.strftime(packet + offset, remaining, "%b %e %H:%M:%S") : 0;
   if (ts_written > 0) {
     offset += ts_written;
-    remaining -= ts_written;
   } else if (remaining > 0) {
     packet[offset++] = '-';
-    remaining--;
   }
 
   // Write hostname, tag, and message
-  ret = snprintf(packet + offset, remaining, " %s %s: %.*s", App.get_name().c_str(), tag, (int) len, message);
-  if (ret > 0) {
-    // snprintf returns chars that would be written; clamp to actual buffer space
-    offset += std::min(static_cast<size_t>(ret), remaining > 0 ? remaining - 1 : 0);
+  offset = buf_append_printf(packet, sizeof(packet), offset, " %s %s: %.*s", App.get_name().c_str(), tag, (int) len,
+                             message);
+  // Clamp to exclude null terminator position if buffer was filled
+  if (offset >= sizeof(packet)) {
+    offset = sizeof(packet) - 1;
   }
 
   if (offset > 0) {

requirements_test.txt

@@ -1,6 +1,6 @@
 pylint==4.0.4
 flake8==7.3.0  # also change in .pre-commit-config.yaml when updating
-ruff==0.14.13  # also change in .pre-commit-config.yaml when updating
+ruff==0.14.12  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.21.2  # also change in .pre-commit-config.yaml when updating
 pre-commit
 

tests/components/template/common-base.yaml

@@ -53,17 +53,6 @@ binary_sensor:
         // Garage Door is closed.
         return false;
       }
-  - platform: template
-    id: select_binary_sensor
-    name: Select is one or two
-    condition:
-      any:
-        - select.is:
-            id: template_select
-            options: [one, two]
-        - select.is:
-            id: template_select
-            lambda: return current == id(template_text).state;
   - platform: template
     id: other_binary_sensor
     name: "Garage Door Closed"
@@ -331,7 +320,6 @@ valve:
 
 text:
   - platform: template
-    id: template_text
     name: "Template text"
     optimistic: true
     min_length: 0