Add LogErrorOnFailure

project-chip · Aug 10, 2023 · 25c27da · 25c27da
1 parent 229b355
commit 25c27da
Showing 1 changed file with 6 additions and 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
@@ -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)