From 94684cdc0bac24f62d01b4ac39ebbf6d31431381 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Mon, 9 Feb 2026 20:20:33 -0600
Subject: [PATCH] Revert early returns in process_active_iterator_()

The if/else pattern produces smaller code than early returns.
---
 esphome/components/api/api_connection.cpp | 41 +++++++++++------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 2151001ca18..39a4174cdfd 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -259,31 +259,30 @@ void APIConnection::loop() {
 void APIConnection::process_active_iterator_() {
   // Caller ensures active_iterator_ != NONE
   if (this->active_iterator_ == ActiveIterator::LIST_ENTITIES) {
-    if (!this->iterator_storage_.list_entities.completed()) {
+    if (this->iterator_storage_.list_entities.completed()) {
+      this->destroy_active_iterator_();
+      if (this->flags_.state_subscription) {
+        this->begin_iterator_(ActiveIterator::INITIAL_STATE);
+      }
+    } else {
       this->process_iterator_batch_(this->iterator_storage_.list_entities);
-      return;
     }
-    this->destroy_active_iterator_();
-    if (this->flags_.state_subscription) {
-      this->begin_iterator_(ActiveIterator::INITIAL_STATE);
+  } else {  // INITIAL_STATE
+    if (this->iterator_storage_.initial_state.completed()) {
+      this->destroy_active_iterator_();
+      // Process any remaining batched messages immediately
+      if (!this->deferred_batch_.empty()) {
+        this->process_batch_();
+      }
+      // Now that everything is sent, enable immediate sending for future state changes
+      this->flags_.should_try_send_immediately = true;
+      // Release excess memory from buffers that grew during initial sync
+      this->deferred_batch_.release_buffer();
+      this->helper_->release_buffers();
+    } else {
+      this->process_iterator_batch_(this->iterator_storage_.initial_state);
     }
-    return;
   }
-  // INITIAL_STATE
-  if (!this->iterator_storage_.initial_state.completed()) {
-    this->process_iterator_batch_(this->iterator_storage_.initial_state);
-    return;
-  }
-  this->destroy_active_iterator_();
-  // Process any remaining batched messages immediately
-  if (!this->deferred_batch_.empty()) {
-    this->process_batch_();
-  }
-  // Now that everything is sent, enable immediate sending for future state changes
-  this->flags_.should_try_send_immediately = true;
-  // Release excess memory from buffers that grew during initial sync
-  this->deferred_batch_.release_buffer();
-  this->helper_->release_buffers();
 }
 
 void APIConnection::process_iterator_batch_(ComponentIterator &iterator) {