Restyled by clang-format

nivi-apple · May 28, 2024 · 100dcd3 · 100dcd3
1 parent 4663c46
commit 100dcd3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 29 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -2751,8 +2751,7 @@ - (void)_removeClusters:(NSSet *)clusterPathsToRemove
 
     [_persistedClusters minusSet:clusterPathsToRemove];
 
-    for (MTRClusterPath * path in clusterPathsToRemove)
-    {
+    for (MTRClusterPath * path in clusterPathsToRemove) {
         [_persistedClusterData removeObjectForKey:path];
         [_persistedClusters removeObject:path];
         [_clusterDataToPersist removeObjectForKey:path];
@@ -2762,14 +2761,12 @@ - (void)_removeClusters:(NSSet *)clusterPathsToRemove
 
 - (void)_removeAttributes:(NSSet *)toBeRemovedAttributes fromCluster:(MTRClusterPath *)clusterPathToRemoveAttributesFrom
 {
-    if (toBeRemovedAttributes == nil || clusterPathToRemoveAttributesFrom == nil)
-    {
+    if (toBeRemovedAttributes == nil || clusterPathToRemoveAttributesFrom == nil) {
         return;
     }
     os_unfair_lock_assert_owner(&self->_lock);
 
-    for (NSNumber * attribute in toBeRemovedAttributes)
-    {
+    for (NSNumber * attribute in toBeRemovedAttributes) {
         [self _removeCachedAttribute:attribute fromCluster:clusterPathToRemoveAttributesFrom];
     }
     [_persistedClusterData removeObjectForKey:clusterPathToRemoveAttributesFrom];
@@ -2808,9 +2805,7 @@ - (void)_pruneOrphanedEndpointsAndClusters:(MTRAttributePath *)attributePath
                 [self _removeClusters:[clusterPathsToRemove copy]];
                 [self.deviceController.controllerDataStore removeEndpointFromEndpointIndex:endpoint forNodeID:self.nodeID];
             }
-        }
-        else if (attributePath.attribute.unsignedLongValue == MTRAttributeIDTypeClusterDescriptorAttributeServerListID)
-        {
+        } else if (attributePath.attribute.unsignedLongValue == MTRAttributeIDTypeClusterDescriptorAttributeServerListID) {
 
             // If the server list changed and clusters were removed, remove the clusters from the _persistedClusters, _persistedClusterData and _clusterDataToPersist for all those clusters.
             // Also remove it from the data store.

diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerDataStore.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerDataStore.mm
@@ -446,7 +446,6 @@ - (BOOL)_storeEndpointIndex:(NSArray<NSNumber *> *)endpointIndex forNodeID:(NSNu
     return [self _storeAttributeCacheValue:endpointIndex forKey:[self _endpointIndexKeyForNodeID:nodeID]];
 }
 
-
 - (void)removeEndpointFromEndpointIndex:(NSNumber *)endpointID forNodeID:(NSNumber *)nodeID
 {
     if (!endpointID || !nodeID) {
@@ -461,8 +460,7 @@ - (void)removeEndpointFromEndpointIndex:(NSNumber *)endpointID forNodeID:(NSNumb
 
         [endpointIndex removeObject:endpointID];
         BOOL success = [self _storeEndpointIndex:endpointIndex forNodeID:nodeID];
-        if (!success)
-        {
+        if (!success) {
             MTR_LOG_ERROR("removeEndpointFromEndpointIndex: _storeEndpointIndex for node 0x%016llX", nodeID.unsignedLongLongValue);
         }
     });
@@ -745,12 +743,10 @@ - (void)clearStoredClusterDataForNodeID:(NSNumber *)nodeID endpointID:(NSNumber
 - (void)removeAttributes:(NSSet<NSNumber *> *)attributes fromCluster:(MTRClusterPath *)path forNodeID:(NSNumber *)nodeID
 {
     MTRDeviceClusterData * clusterData = [self getStoredClusterDataForNodeID:nodeID endpointID:path.endpoint clusterID:path.cluster];
-    if (clusterData == nil)
-    {
+    if (clusterData == nil) {
         return;
     }
-    for (NSNumber * attribute in attributes)
-    {
+    for (NSNumber * attribute in attributes) {
         [clusterData removeValueForAttribute:attribute];
     }
     [self _storeClusterData:clusterData forNodeID:nodeID endpointID:path.endpoint clusterID:path.cluster];

diff --git a/src/darwin/Framework/CHIPTests/MTRPerControllerStorageTests.m b/src/darwin/Framework/CHIPTests/MTRPerControllerStorageTests.m
@@ -2222,7 +2222,6 @@ - (MTRDevice *)getMTRDevice:(NSNumber *)deviceID
 
     [endpoints addObjectsFromArray:[device arrayOfNumbersFromAttributeValue:[device _dataValueWithoutDataVersion:partsList]]];
     return endpoints;
-
 }
 
 - (void)test011_testDataStorageUpdatesWhenRemovingEndpoints
@@ -2265,7 +2264,7 @@ - (void)test011_testDataStorageUpdatesWhenRemovingEndpoints
         }
     };
 
-    __block NSMutableDictionary<NSNumber * , NSArray<NSNumber *> *> * initialClusterIndex = [[NSMutableDictionary alloc] init];
+    __block NSMutableDictionary<NSNumber *, NSArray<NSNumber *> *> * initialClusterIndex = [[NSMutableDictionary alloc] init];
     __block NSMutableArray * testEndpoints;
 
     delegate.onReportEnd = ^{
@@ -2279,8 +2278,7 @@ - (void)test011_testDataStorageUpdatesWhenRemovingEndpoints
         dispatch_sync(self->_storageQueue, ^{
             XCTAssertTrue([[controller.controllerDataStore _fetchEndpointIndexForNodeID:deviceID] isEqualToArray:testEndpoints]);
             // Populate the initialClusterIndex to use as a reference for all cluster paths later.
-            for (NSNumber * endpoint in testEndpoints)
-            {
+            for (NSNumber * endpoint in testEndpoints) {
                 [initialClusterIndex setObject:[controller.controllerDataStore _fetchClusterIndexForNodeID:deviceID endpointID:endpoint] forKey:endpoint];
             }
             XCTAssertNotNil(initialClusterIndex);
@@ -2485,12 +2483,9 @@ - (void)test012_testDataStorageUpdatesWhenRemovingClusters
         dispatch_sync(self->_storageQueue, ^{
             XCTAssertFalse([[controller.controllerDataStore _fetchClusterIndexForNodeID:deviceID endpointID:testEndpoint] containsObject:toBeDeletedCluster]);
             for (NSNumber * cluster in initialClusterIndex) {
-                if ([cluster isEqualToNumber:toBeDeletedCluster])
-                {
+                if ([cluster isEqualToNumber:toBeDeletedCluster]) {
                     XCTAssertNil([controller.controllerDataStore _fetchClusterDataForNodeID:deviceID endpointID:testEndpoint clusterID:cluster]);
-                }
-                else
-                {
+                } else {
                     XCTAssertNotNil([controller.controllerDataStore _fetchClusterDataForNodeID:deviceID endpointID:testEndpoint clusterID:cluster]);
                 }
             }
@@ -2562,7 +2557,6 @@ - (void)test013_testDataStorageUpdatesWhenRemovingAttributes
         XCTAssertNotNil(testClusterDataValue);
 
         dispatch_sync(self->_storageQueue, ^{
-
             initialClusterIndex = [[controller.controllerDataStore _fetchClusterIndexForNodeID:deviceID endpointID:testEndpoint] mutableCopy];
             XCTAssertNotNil(initialClusterIndex);
 
@@ -2573,7 +2567,7 @@ - (void)test013_testDataStorageUpdatesWhenRemovingAttributes
                 // We will be paged in the cluster data from storage to check the above.
                 MTRClusterPath * path = [MTRClusterPath clusterPathWithEndpointID:testEndpoint clusterID:cluster];
 
-                 if ([cluster isEqualToNumber:@(MTRClusterIDTypeIdentifyID)]) {
+                if ([cluster isEqualToNumber:@(MTRClusterIDTypeIdentifyID)]) {
                     MTRDeviceClusterData * data = [device _getClusterDataForPath:path];
                     XCTAssertNotNil(data);
                     XCTAssertNotNil(data.attributes);
@@ -2589,7 +2583,6 @@ - (void)test013_testDataStorageUpdatesWhenRemovingAttributes
                     }
                 }
             }
-
         });
 
         [subscriptionExpectation fulfill];
@@ -2621,7 +2614,6 @@ - (void)test013_testDataStorageUpdatesWhenRemovingAttributes
     };
 
     delegate.onReportEnd = ^{
-
         // Make sure that the cluster data in the data storage is populated with cluster data for MTRClusterIDTypeIdentifyID cluster
         // and has all attributes except attribute 1 which was deleted.
         // We will be paged in the cluster data from storage to check the above.