Applied code review comments

project-chip · Jun 28, 2022 · 0df7a72 · 0df7a72
1 parent 676908e
commit 0df7a72
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/app/clusters/access-control-server/access-control-server.cpp b/src/app/clusters/access-control-server/access-control-server.cpp
@@ -149,7 +149,6 @@ CHIP_ERROR AccessControlAttribute::ReadAcl(AttributeValueEncoder & aEncoder)
 
 CHIP_ERROR AccessControlAttribute::ReadExtension(AttributeValueEncoder & aEncoder)
 {
-#if SUPPORT_EXTENSION
     auto & storage = Server::GetInstance().GetPersistentStorage();
     DefaultStorageKeyAllocator key;
 
@@ -175,9 +174,6 @@ CHIP_ERROR AccessControlAttribute::ReadExtension(AttributeValueEncoder & aEncode
         }
         return CHIP_NO_ERROR;
     });
-#else
-    return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
-#endif
 }
 
 CHIP_ERROR AccessControlAttribute::Write(const ConcreteDataAttributePath & aPath, AttributeValueDecoder & aDecoder)

diff --git a/src/credentials/FabricTable.cpp b/src/credentials/FabricTable.cpp
@@ -51,14 +51,15 @@ constexpr TLV::Tag kFabricLabelTag = TLV::ContextTag(1);
 constexpr TLV::Tag kNextAvailableFabricIndexTag = TLV::ContextTag(0);
 constexpr TLV::Tag kFabricIndicesTag            = TLV::ContextTag(1);
 
-// Tagsd for commit marker storage
+// Tags for commit marker storage
 constexpr TLV::Tag kMarkerFabricIndexTag = TLV::ContextTag(0);
 constexpr TLV::Tag kMarkerIsAdditionTag  = TLV::ContextTag(1);
 
 constexpr size_t CommitMarkerContextTLVMaxSize()
 {
-    // Add room for the future
-    return TLV::EstimateStructOverhead(sizeof(FabricIndex), sizeof(bool)) * 2;
+    // Add 2x uncommitted uint64_t to leave space for backwards/forwards
+    // versioning for this critical feature that runs at boot.
+    return TLV::EstimateStructOverhead(sizeof(FabricIndex), sizeof(bool), sizeof(uint64_t), sizeof(uint64_t));
 }
 
 constexpr size_t IndexInfoTLVMaxSize()

diff --git a/src/credentials/FabricTable.h b/src/credentials/FabricTable.h
@@ -423,7 +423,7 @@ class DLL_EXPORT FabricTable
     void Shutdown();
 
     /**
-     * @brief If `Init()` caused a Deted due to partial commit, the fabric index at play is returned.
+     * @brief If `Init()` caused a Delete due to partial commit, the fabric index at play is returned.
      *
      * Allows caller to schedule more clean-up. This is because at Init() time, none of the delegates
      * are registered yet, so no other modules would learn of the removal.