Cleanup of logErrors, added missing break in case

project-chip · Aug 29, 2023 · 2131225 · 2131225
1 parent 18abfad
commit 2131225
Show file tree

Hide file tree

Showing 4 changed files with 608 additions and 3 deletions.
diff --git a/src/app/clusters/scenes/SceneTable.h b/src/app/clusters/scenes/SceneTable.h
@@ -296,7 +296,6 @@ class SceneTable
     // Handlers
     virtual bool HandlerListEmpty() { return mHandlerList.Empty(); }
 
-    // SceneHandler * mHandlers[kMaxSceneHandlers] = { nullptr };
     IntrusiveList<SceneHandler> mHandlerList;
 };
 

diff --git a/src/app/clusters/scenes/SceneTableImpl.cpp b/src/app/clusters/scenes/SceneTableImpl.cpp
@@ -80,7 +80,7 @@ struct SceneTableData : public SceneTableEntry, PersistentData<kPersistentSceneB
     {
         CharSpan nameSpan(mStorageData.mName, mStorageData.mNameLength);
         TLV::TLVType container;
-        LogErrorOnFailure(writer.StartContainer(TLV::AnonymousTag(), TLV::kTLVType_Structure, container));
+        ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag(), TLV::kTLVType_Structure, container));
 
         // Scene ID
         ReturnErrorOnFailure(writer.Put(TLV::ContextTag(TagScene::kEndpointID), mStorageId.mEndpointId));