From 25c27dac2839d591bd066f125e23acabbd390256 Mon Sep 17 00:00:00 2001 From: Hare Date: Thu, 10 Aug 2023 09:03:40 +0800 Subject: [PATCH] Add LogErrorOnFailure --- .../smoke-co-alarm-server/smoke-co-alarm-server.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.cpp b/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.cpp index f2dcae1332c462..eb134736bfa9df 100644 --- a/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.cpp +++ b/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.cpp @@ -100,12 +100,14 @@ void SmokeCoAlarmServer::SetExpressedStateByPriority(EndpointId endpointId, break; } - VerifyOrReturn(alarmState == AlarmStateEnum::kNormal, SetExpressedState(endpointId, priority)); - VerifyOrReturn(endOfServiceState == EndOfServiceEnum::kNormal, SetExpressedState(endpointId, priority)); - VerifyOrReturn(active == false, SetExpressedState(endpointId, priority)); + if ((alarmState != AlarmStateEnum::kNormal) || (endOfServiceState != EndOfServiceEnum::kNormal) || active) + { + LogErrorOnFailure(SetExpressedState(endpointId, priority)); + return; + } } - SetExpressedState(endpointId, ExpressedStateEnum::kNormal); + LogErrorOnFailure(SetExpressedState(endpointId, ExpressedStateEnum::kNormal)); } bool SmokeCoAlarmServer::SetSmokeState(EndpointId endpointId, AlarmStateEnum newSmokeState)