Restyled

examples/chip-tool/commands/group/Commands.h

@@ -54,7 +54,7 @@ class ShowControllerGroups : public CHIPCommand
         fprintf(stderr, "  | Available Groups :                                                                  |\n");
         fprintf(stderr, "  +-------------------------------------------------------------------------------------+\n");
         fprintf(stderr, "  | Group Id   |  KeySet Id     |   Group Name                                          |\n");
-        chip::FabricIndex fabricIndex = CurrentCommissioner().GetFabricIndex();
+        chip::FabricIndex fabricIndex                            = CurrentCommissioner().GetFabricIndex();
         chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
         auto it                                                  = groupDataProvider->IterateGroupInfo(fabricIndex);
         chip::Credentials::GroupDataProvider::GroupInfo group;
@@ -97,7 +97,7 @@ class AddGroup : public CHIPCommand
             return CHIP_ERROR_INVALID_ARGUMENT;
         }
 
-        chip::FabricIndex fabricIndex = CurrentCommissioner().GetFabricIndex();
+        chip::FabricIndex fabricIndex                            = CurrentCommissioner().GetFabricIndex();
         chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
         chip::Credentials::GroupDataProvider::GroupInfo group;
 
@@ -131,7 +131,7 @@ class RemoveGroup : public CHIPCommand
             return CHIP_ERROR_INVALID_ARGUMENT;
         }
 
-        chip::FabricIndex fabricIndex = CurrentCommissioner().GetFabricIndex();
+        chip::FabricIndex fabricIndex                            = CurrentCommissioner().GetFabricIndex();
         chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
         ReturnErrorOnFailure(groupDataProvider->RemoveGroupInfo(fabricIndex, groupId));
         SetCommandExitStatus(CHIP_NO_ERROR);
@@ -150,7 +150,7 @@ class ShowKeySets : public CHIPCommand
 
     CHIP_ERROR RunCommand() override
     {
-        chip::FabricIndex fabricIndex = CurrentCommissioner().GetFabricIndex();
+        chip::FabricIndex fabricIndex                            = CurrentCommissioner().GetFabricIndex();
         chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
         chip::Credentials::GroupDataProvider::KeySet keySet;
 
@@ -189,8 +189,8 @@ class BindKeySet : public CHIPCommand
 
     CHIP_ERROR RunCommand() override
     {
-        size_t current_count = 0;
-        chip::FabricIndex fabricIndex = CurrentCommissioner().GetFabricIndex();
+        size_t current_count                                     = 0;
+        chip::FabricIndex fabricIndex                            = CurrentCommissioner().GetFabricIndex();
         chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
 
         auto iter     = groupDataProvider->IterateGroupKeys(fabricIndex);
@@ -221,8 +221,8 @@ class UnbindKeySet : public CHIPCommand
 
     CHIP_ERROR RunCommand() override
     {
-        size_t index = 0;
-        chip::FabricIndex fabricIndex = CurrentCommissioner().GetFabricIndex();
+        size_t index                                             = 0;
+        chip::FabricIndex fabricIndex                            = CurrentCommissioner().GetFabricIndex();
         chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
         auto iter                                                = groupDataProvider->IterateGroupKeys(fabricIndex);
         size_t maxCount                                          = iter->Count();
@@ -266,7 +266,7 @@ class AddKeySet : public CHIPCommand
 
     CHIP_ERROR RunCommand() override
     {
-        chip::FabricIndex fabricIndex = CurrentCommissioner().GetFabricIndex();
+        chip::FabricIndex fabricIndex                            = CurrentCommissioner().GetFabricIndex();
         chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
         uint8_t compressed_fabric_id[sizeof(uint64_t)];
         chip::MutableByteSpan compressed_fabric_id_span(compressed_fabric_id);
@@ -309,8 +309,8 @@ class RemoveKeySet : public CHIPCommand
 
     CHIP_ERROR RunCommand() override
     {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        chip::FabricIndex fabricIndex = CurrentCommissioner().GetFabricIndex();
+        CHIP_ERROR err                                           = CHIP_NO_ERROR;
+        chip::FabricIndex fabricIndex                            = CurrentCommissioner().GetFabricIndex();
         chip::Credentials::GroupDataProvider * groupDataProvider = chip::Credentials::GetGroupDataProvider();
 
         // Unbind all group

src/access/AccessControl.h

@@ -597,7 +597,7 @@ class AccessControl
             while (aclCount)
             {
                 CHIP_ERROR err = DeleteEntry(nullptr, fabricIndex, --aclCount);
-                stickyError = (stickyError == CHIP_NO_ERROR) ? err : stickyError;
+                stickyError    = (stickyError == CHIP_NO_ERROR) ? err : stickyError;
             }
         }
 

src/access/tests/TestAccessControl.cpp

@@ -777,7 +777,8 @@ constexpr EntryData entryData1[] = {
 };
 
 constexpr size_t entryData1Count = ArraySize(entryData1);
-static_assert(entryData1Count == (kNumFabric1EntriesInEntryData1 + kNumFabric2EntriesInEntryData1), "Must maintain both fabric counts for some tests");
+static_assert(entryData1Count == (kNumFabric1EntriesInEntryData1 + kNumFabric2EntriesInEntryData1),
+              "Must maintain both fabric counts for some tests");
 
 struct CheckData
 {
@@ -1771,7 +1772,7 @@ void TestDeleteEntry(nlTestSuite * inSuite, void * inContext)
         // After deleting Fabric index 1, we should have the number of entries of Fabric index 2
         NL_TEST_ASSERT(inSuite, accessControl.DeleteAllEntriesForFabric(1) == CHIP_NO_ERROR);
         size_t numEntriesForFabricIndex2 = 0;
-        size_t numTotalEntries = 0;
+        size_t numTotalEntries           = 0;
         NL_TEST_ASSERT(inSuite, accessControl.GetEntryCount(2, numEntriesForFabricIndex2) == CHIP_NO_ERROR);
         NL_TEST_ASSERT(inSuite, accessControl.GetEntryCount(numTotalEntries) == CHIP_NO_ERROR);
         NL_TEST_ASSERT(inSuite, numEntriesForFabricIndex2 == kNumFabric2EntriesInEntryData1);

src/app/clusters/operational-credentials-server/operational-credentials-server.cpp

@@ -371,7 +371,7 @@ constexpr size_t kMaxRspLen = 900;
 // logic.
 class OpCredsFabricTableDelegate : public chip::FabricTable::Delegate
 {
-  public:
+public:
     // Gets called when a fabric is deleted from KVS store
     void OnFabricRemoved(const FabricTable & fabricTable, FabricIndex fabricIndex) override
     {
@@ -402,10 +402,7 @@ class OpCredsFabricTableDelegate : public chip::FabricTable::Delegate
         NotifyFabricTableChanged();
     }
 
-    void OnFabricUpdated(const FabricTable & fabricTable, FabricIndex fabricIndex) override
-    {
-        NotifyFabricTableChanged();
-    }
+    void OnFabricUpdated(const FabricTable & fabricTable, FabricIndex fabricIndex) override { NotifyFabricTableChanged(); }
 
     // Gets called when a fabric in FabricTable is persisted to storage
     void OnFabricCommitted(const FabricTable & fabricTable, FabricIndex fabricIndex) override
@@ -423,14 +420,13 @@ class OpCredsFabricTableDelegate : public chip::FabricTable::Delegate
         NotifyFabricTableChanged();
     }
 
-  private:
+private:
     void NotifyFabricTableChanged()
     {
         // Opcreds cluster is always on Endpoint 0
         MatterReportingAttributeChangeCallback(0, OperationalCredentials::Id,
                                                OperationalCredentials::Attributes::CommissionedFabrics::Id);
-        MatterReportingAttributeChangeCallback(0, OperationalCredentials::Id,
-                                               OperationalCredentials::Attributes::Fabrics::Id);
+        MatterReportingAttributeChangeCallback(0, OperationalCredentials::Id, OperationalCredentials::Attributes::Fabrics::Id);
     }
 };
 
@@ -798,12 +794,12 @@ bool emberAfOperationalCredentialsClusterAddNOCCallback(app::CommandHandler * co
         // and error handling does not assist.
         if (groupDataProvider != nullptr)
         {
-            (void)groupDataProvider->RemoveFabric(newFabricIndex);
+            (void) groupDataProvider->RemoveFabric(newFabricIndex);
         }
 
         // TODO(#19898): All ACL work done within AddNOC does not trigger ACL cluster updates
 
-        (void)Access::GetAccessControl().DeleteAllEntriesForFabric(newFabricIndex);
+        (void) Access::GetAccessControl().DeleteAllEntriesForFabric(newFabricIndex);
 
         MatterReportingAttributeChangeCallback(commandPath.mEndpointId, OperationalCredentials::Id,
                                                OperationalCredentials::Attributes::CommissionedFabrics::Id);
@@ -860,7 +856,7 @@ bool emberAfOperationalCredentialsClusterUpdateNOCCallback(app::CommandHandler *
     FabricInfo * fabricInfo           = RetrieveCurrentFabric(commandObj);
 
     bool csrWasForUpdateNoc = false; //< Output param of HasPendingOperationalKey
-    bool hasPendingKey  = fabricTable.HasPendingOperationalKey(csrWasForUpdateNoc);
+    bool hasPendingKey      = fabricTable.HasPendingOperationalKey(csrWasForUpdateNoc);
 
     VerifyOrExit(NOCValue.size() <= Credentials::kMaxCHIPCertLength, nonDefaultStatus = Status::InvalidCommand);
     VerifyOrExit(!ICACValue.HasValue() || ICACValue.Value().size() <= Credentials::kMaxCHIPCertLength,

src/app/server/Server.h

@@ -450,8 +450,7 @@ class Server
             CHIP_ERROR aclErr = Access::GetAccessControl().DeleteAllEntriesForFabric(fabricIndex);
             if (aclErr != CHIP_NO_ERROR)
             {
-                ChipLogError(AppServer,
-                             "Warning, failed to delete access control state for fabric index 0x%x: %" CHIP_ERROR_FORMAT,
+                ChipLogError(AppServer, "Warning, failed to delete access control state for fabric index 0x%x: %" CHIP_ERROR_FORMAT,
                              static_cast<unsigned>(fabricIndex), aclErr.Format());
             }
         }