From 8c1717607cda78a27da44f3deb440dae2d523d08 Mon Sep 17 00:00:00 2001 From: Anush Nadathur Date: Fri, 14 Jun 2024 14:31:56 -0700 Subject: [PATCH] Restyler fixes --- src/app/ReadClient.cpp | 2 +- src/protocols/secure_channel/CASESession.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/ReadClient.cpp b/src/app/ReadClient.cpp index 19c951377299cb..78b0a56fdd7c26 100644 --- a/src/app/ReadClient.cpp +++ b/src/app/ReadClient.cpp @@ -1104,7 +1104,7 @@ CHIP_ERROR ReadClient::SendSubscribeRequest(const ReadPrepareParams & aReadPrepa VerifyOrReturnError(aReadPrepareParams.mMinIntervalFloorSeconds <= aReadPrepareParams.mMaxIntervalCeilingSeconds, CHIP_ERROR_INVALID_ARGUMENT); - auto err = SendSubscribeRequestImpl(aReadPrepareParams); + auto err = SendSubscribeRequestImpl(aReadPrepareParams); if (CHIP_NO_ERROR != err) { MATTER_LOG_METRIC_END(Tracing::kMetricDeviceSubscriptionSetup, err); diff --git a/src/protocols/secure_channel/CASESession.cpp b/src/protocols/secure_channel/CASESession.cpp index a53ccbd8df3f7c..e6ed3eb80d1b70 100644 --- a/src/protocols/secure_channel/CASESession.cpp +++ b/src/protocols/secure_channel/CASESession.cpp @@ -528,7 +528,8 @@ CHIP_ERROR CASESession::EstablishSession(SessionManager & sessionManager, Fabric // Use FabricTable directly to avoid situation of dangling index from stale FabricInfo // until we factor-out any FabricInfo direct usage. - ReturnErrorCodeWithMetricIf(kMetricDeviceCASESession, peerScopedNodeId.GetFabricIndex() == kUndefinedFabricIndex, CHIP_ERROR_INVALID_ARGUMENT); + ReturnErrorCodeWithMetricIf(kMetricDeviceCASESession, peerScopedNodeId.GetFabricIndex() == kUndefinedFabricIndex, + CHIP_ERROR_INVALID_ARGUMENT); const auto * fabricInfo = fabricTable->FindFabricWithIndex(peerScopedNodeId.GetFabricIndex()); ReturnErrorCodeWithMetricIf(kMetricDeviceCASESession, fabricInfo == nullptr, CHIP_ERROR_INVALID_ARGUMENT); @@ -1037,7 +1038,6 @@ CHIP_ERROR CASESession::HandleSigma1(System::PacketBufferHandle && msg) // mRemotePubKey.Length() == initiatorPubKey.size() == kP256_PublicKey_Length. memcpy(mRemotePubKey.Bytes(), initiatorPubKey.data(), mRemotePubKey.Length()); - MATTER_LOG_METRIC_BEGIN(kMetricDeviceCASESessionSigma2); err = SendSigma2(); if (CHIP_NO_ERROR != err) @@ -2382,7 +2382,7 @@ CHIP_ERROR CASESession::OnMessageReceived(ExchangeContext * ec, const PayloadHea { // Need to capture before invoking status report since 'this' might be deallocated on successful completion of sigma3 auto key = (mState == State::kSentSigma3) ? kMetricDeviceCASESessionSigma3 : kMetricDeviceCASESessionSigma2Resume; - err = HandleStatusReport(std::move(msg), /* successExpected*/ true); + err = HandleStatusReport(std::move(msg), /* successExpected*/ true); MATTER_LOG_METRIC_END(key, err); } break;