From 0773fc320b3b4999150f961159d76ab31f93cb4f Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sat, 26 Jul 2025 14:57:42 -1000 Subject: [PATCH] dry --- esphome/components/api/proto.h | 4 ++-- script/api_protobuf/api_protobuf.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/esphome/components/api/proto.h b/esphome/components/api/proto.h index da7d236ff1..52733aaf7e 100644 --- a/esphome/components/api/proto.h +++ b/esphome/components/api/proto.h @@ -771,13 +771,13 @@ class ProtoSize { * @param messages Vector of message objects */ template - inline void add_force_message(uint32_t field_id_size, const std::vector &messages) { + inline void add_repeated_message(uint32_t field_id_size, const std::vector &messages) { // Skip if the vector is empty if (messages.empty()) { return; } - // Use the force version for all messages + // Use the force version for all messages in the repeated field for (const auto &message : messages) { add_message_object_force(field_id_size, message); } diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py index 171468410f..f0b636b775 100755 --- a/script/api_protobuf/api_protobuf.py +++ b/script/api_protobuf/api_protobuf.py @@ -1236,7 +1236,7 @@ class RepeatedTypeInfo(TypeInfo): if isinstance(self._ti, MessageType): # For repeated messages, use the dedicated helper that handles iteration internally field_id_size = self._ti.calculate_field_id_size() - o = f"size.add_force_message({field_id_size}, {name});" + o = f"size.add_repeated_message({field_id_size}, {name});" return o # For other repeated types, use the underlying type's size calculation with force=True