From 7ba72a65c02ab8a22fd37301e607d8d257b4bc75 Mon Sep 17 00:00:00 2001 From: Anush Nadathur Date: Fri, 23 Aug 2024 09:40:50 -0700 Subject: [PATCH] Restyle fixes --- .../Framework/CHIP/MTRDeviceController.mm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm index c222593369b583..cf6aa8a1871fdf 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceController.mm +++ b/src/darwin/Framework/CHIP/MTRDeviceController.mm @@ -336,17 +336,13 @@ - (BOOL)matchesPendingShutdownWithParams:(MTRDeviceControllerParameters *)parame if (!parameters.operationalCertificate || !parameters.rootCertificate) { return FALSE; } - NSNumber *nodeID = [MTRDeviceControllerParameters nodeIDFromNOC:parameters.operationalCertificate]; - NSNumber *fabricID = [MTRDeviceControllerParameters fabricIDFromNOC:parameters.operationalCertificate]; - NSData *publicKey = [MTRDeviceControllerParameters publicKeyFromCertificate:parameters.rootCertificate]; + NSNumber * nodeID = [MTRDeviceControllerParameters nodeIDFromNOC:parameters.operationalCertificate]; + NSNumber * fabricID = [MTRDeviceControllerParameters fabricIDFromNOC:parameters.operationalCertificate]; + NSData * publicKey = [MTRDeviceControllerParameters publicKeyFromCertificate:parameters.rootCertificate]; std::lock_guard lock(_assertionLock); - return _keepRunningAssertionCounter > 0 && - _shutdownPending && - MTREqualObjects(nodeID, self.nodeID) && - MTREqualObjects(fabricID, self.fabricID) && - MTREqualObjects(publicKey, self.rootPublicKey); + return _keepRunningAssertionCounter > 0 && _shutdownPending && MTREqualObjects(nodeID, self.nodeID) && MTREqualObjects(fabricID, self.fabricID) && MTREqualObjects(publicKey, self.rootPublicKey); } - (void)addRunAssertion @@ -701,9 +697,9 @@ - (BOOL)startup:(MTRDeviceControllerStartupParamsInternal *)startupParams chip::Crypto::P256PublicKey rootPublicKey; if (_cppCommissioner->GetRootPublicKey(rootPublicKey) == CHIP_NO_ERROR) { - self.rootPublicKey = [NSData dataWithBytes:rootPublicKey.Bytes() length:rootPublicKey.Length()]; - self.nodeID = @(_cppCommissioner->GetNodeId()); - self.fabricID = @(_cppCommissioner->GetFabricId()); + self.rootPublicKey = [NSData dataWithBytes:rootPublicKey.Bytes() length:rootPublicKey.Length()]; + self.nodeID = @(_cppCommissioner->GetNodeId()); + self.fabricID = @(_cppCommissioner->GetFabricId()); } commissionerInitialized = YES;