commit 0d5c917e9d2114e6bfa6735079afad69a6b333fc
author mkardous-silabs <84793247+mkardous-silabs@users.noreply.github.com> Mon May 23 16:03:02 2022 -0400
committer GitHub <noreply@github.com> Mon May 23 16:03:02 2022 -0400
tree 9394abc7341610375833ef3d569922512a7eb614
parent 2db812e8ef2f7fe3edfe04da4b526b3e977a1a43

Clean up group invoke requests (#18683)

* code clean up

* Restyled by clang-format

Co-authored-by: Restyled.io <commits@restyled.io>

src/controller/InvokeInteraction.h

diff --git a/src/controller/InvokeInteraction.h b/src/controller/InvokeInteraction.h
index 4af4b5e..2e88165 100644
--- a/src/controller/InvokeInteraction.h
+++ b/src/controller/InvokeInteraction.h
@@ -105,7 +105,6 @@
 CHIP_ERROR InvokeGroupCommandRequest(Messaging::ExchangeManager * exchangeMgr, chip::FabricIndex fabric, chip::GroupId groupId,
                                      const RequestObjectT & requestCommandData)
 {
-    CHIP_ERROR error                   = CHIP_NO_ERROR;
     app::CommandPathParams commandPath = { groupId, RequestObjectT::GetClusterId(), RequestObjectT::GetCommandId(),
                                            app::CommandPathFlags::kGroupIdValid };
     Transport::OutgoingGroupSession session(groupId, fabric);
@@ -113,15 +112,8 @@
     auto commandSender = chip::Platform::MakeUnique<app::CommandSender>(nullptr, exchangeMgr);
     VerifyOrReturnError(commandSender != nullptr, CHIP_ERROR_NO_MEMORY);
 
-    error = commandSender->AddRequestData(commandPath, requestCommandData);
-    SuccessOrExit(error);
-
-    error = commandSender->SendGroupCommandRequest(SessionHandle(session));
-    SuccessOrExit(error);
-
-exit:
-    chip::Platform::Delete(commandSender.release());
-    return error;
+    ReturnErrorOnFailure(commandSender->AddRequestData(commandPath, requestCommandData));
+    return commandSender->SendGroupCommandRequest(SessionHandle(session));
 }
 
 template <typename RequestObjectT>