Fix comment application

Author: mkardous-silabs

src/app/InteractionModelEngine.cpp

@@ -1916,22 +1916,22 @@ CHIP_ERROR InteractionModelEngine::ResumeSubscriptions()
     // future improvements: https://github.com/project-chip/connectedhomeip/issues/25439
 
     SubscriptionResumptionStorage::SubscriptionInfo subscriptionInfo;
-    auto * iterator            = mpSubscriptionResumptionStorage->IterateSubscriptions();
-    mNumOfSubscriptionToResume = 0;
-    uint16_t minInterval       = 0;
+    auto * iterator             = mpSubscriptionResumptionStorage->IterateSubscriptions();
+    mNumOfSubscriptionsToResume = 0;
+    uint16_t minInterval        = 0;
     while (iterator->Next(subscriptionInfo))
     {
-        mNumOfSubscriptionToResume++;
+        mNumOfSubscriptionsToResume++;
         minInterval = std::max(minInterval, subscriptionInfo.mMinInterval);
     }
     iterator->Release();
 
-    if (mNumOfSubscriptionToResume)
+    if (mNumOfSubscriptionsToResume)
     {
 #if CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
         mSubscriptionResumptionScheduled = true;
 #endif
-        ChipLogProgress(InteractionModel, "Resuming %d subscriptions in %u seconds", mNumOfSubscriptionToResume, minInterval);
+        ChipLogProgress(InteractionModel, "Resuming %d subscriptions in %u seconds", mNumOfSubscriptionsToResume, minInterval);
         ReturnErrorOnFailure(mpExchangeMgr->GetSessionManager()->SystemLayer()->StartTimer(System::Clock::Seconds16(minInterval),
                                                                                            ResumeSubscriptionsTimerCallback, this));
     }
@@ -2056,15 +2056,15 @@ bool InteractionModelEngine::HasSubscriptionsToResume()
 #if CHIP_CONFIG_PERSIST_SUBSCRIPTIONS
 void InteractionModelEngine::DecrementNumSubscriptionsToResume()
 {
-    VerifyOrReturn(mNumOfSubscriptionToResume > 0);
+    VerifyOrReturn(mNumOfSubscriptionsToResume > 0);
 #if CHIP_CONFIG_ENABLE_ICD_CIP && !CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
     VerifyOrDie(mICDManager);
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP && !CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
 
-    mNumOfSubscriptionToResume--;
+    mNumOfSubscriptionsToResume--;
 
 #if CHIP_CONFIG_ENABLE_ICD_CIP && !CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
-    if (!mNumOfSubscriptionToResume)
+    if (!mNumOfSubscriptionsToResume)
     {
         mICDManager->SetBootUpResumeSubscriptionExecuted();
     }

src/app/icd/server/ICDManager.cpp

@@ -294,10 +294,11 @@ bool ICDManager::ShouldCheckInMsgsBeSentAtActiveModeFunction(FabricIndex aFabric
 bool ICDManager::ShouldCheckInMsgsBeSentAtActiveModeFunction(FabricIndex aFabricIndex, NodeId subjectID)
 {
     bool mightHaveSubscription = mSubInfoProvider->SubjectHasActiveSubscription(aFabricIndex, subjectID);
-    if (!mightHaveSubscription && !mIsBootUpResumeSubscriptionExecuted) {
+    if (!mightHaveSubscription && !mIsBootUpResumeSubscriptionExecuted)
+    {
         mightHaveSubscription = mSubInfoProvider->SubjectHasPersistedSubscription(aFabricIndex, subjectID);
     }
-    
+
     return !mightHaveSubscription;
 }
 #endif // CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
@@ -397,7 +398,7 @@ void ICDManager::UpdateOperationState(OperationalState state)
         // unless the device would need to send Check-In messages
         if (ICDConfigurationData::GetInstance().GetActiveModeDuration() > kZero
 #if CHIP_CONFIG_ENABLE_ICD_CIP
-            || CheckInMessagesWouldBeSent(function)
+            || CheckInMessagesWouldBeSent(sendCheckInMessagesOnActiveMode)
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
         )
         {

src/app/server/Server.cpp

@@ -449,9 +449,9 @@ void Server::OnPlatformEvent(const DeviceLayer::ChipDeviceEvent & event)
         // We trigger Check-In messages before resuming subscriptions to avoid doing both.
         if (!mFailSafeContext.IsFailSafeArmed())
         {
-            std::function<app::ICDManager::ShouldCheckInMsgsBeSentFunction> function =
+            std::function<app::ICDManager::ShouldCheckInMsgsBeSentFunction> sendCheckInMessagesOnBootUp =
                 std::bind(&Server::ShouldCheckInMsgsBeSentAtBootFunction, this, std::placeholders::_1, std::placeholders::_2);
-            mICDManager.TriggerCheckInMessages(function);
+            mICDManager.TriggerCheckInMessages(sendCheckInMessagesOnBootUp);
         }
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER && CHIP_CONFIG_ENABLE_ICD_CIP
 #if CHIP_CONFIG_PERSIST_SUBSCRIPTIONS

src/app/tests/TestInteractionModelEngine.cpp

@@ -701,7 +701,7 @@ void TestInteractionModelEngine::TestDecrementNumSubscriptionsToResume(nlTestSui
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP && CHIP_CONFIG_PERSIST_SUBSCRIPTIONS && !CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
 
     // Set number of subs
-    engine->mNumOfSubscriptionToResume = kNumberOfSubsToResume;
+    engine->mNumOfSubscriptionsToResume = kNumberOfSubsToResume;
 
 #if CHIP_CONFIG_ENABLE_ICD_CIP && !CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
     // Verify mIsBootUpResumeSubscriptionExecuted has not been set
@@ -711,7 +711,7 @@ void TestInteractionModelEngine::TestDecrementNumSubscriptionsToResume(nlTestSui
     // Decrease number of subs by 1
     numberOfSubsRemaining--;
     engine->DecrementNumSubscriptionsToResume();
-    NL_TEST_ASSERT_EQUALS(apSuite, numberOfSubsRemaining, engine->mNumOfSubscriptionToResume);
+    NL_TEST_ASSERT_EQUALS(apSuite, numberOfSubsRemaining, engine->mNumOfSubscriptionsToResume);
 
     // Decrease to 0 subs remaining
     while (numberOfSubsRemaining > 0)
@@ -723,7 +723,7 @@ void TestInteractionModelEngine::TestDecrementNumSubscriptionsToResume(nlTestSui
 
         numberOfSubsRemaining--;
         engine->DecrementNumSubscriptionsToResume();
-        NL_TEST_ASSERT_EQUALS(apSuite, numberOfSubsRemaining, engine->mNumOfSubscriptionToResume);
+        NL_TEST_ASSERT_EQUALS(apSuite, numberOfSubsRemaining, engine->mNumOfSubscriptionsToResume);
     }
 
 #if CHIP_CONFIG_ENABLE_ICD_CIP && !CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
@@ -733,7 +733,7 @@ void TestInteractionModelEngine::TestDecrementNumSubscriptionsToResume(nlTestSui
 
     // Make sure we don't rollover / go negative
     engine->DecrementNumSubscriptionsToResume();
-    NL_TEST_ASSERT_EQUALS(apSuite, numberOfSubsRemaining, engine->mNumOfSubscriptionToResume);
+    NL_TEST_ASSERT_EQUALS(apSuite, numberOfSubsRemaining, engine->mNumOfSubscriptionsToResume);
 
     // Clean up
 #if CHIP_CONFIG_ENABLE_ICD_CIP && !CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION