From d4b58329e808d17d597dc7bb026920df3209493e Mon Sep 17 00:00:00 2001 From: Yufeng Wang Date: Thu, 3 Mar 2022 14:08:04 -0800 Subject: [PATCH] Cleanup redundant helper function in localization configuration server (#15744) * Cleanup redundant helper function * Update src/app/clusters/localization-configuration-server/localization-configuration-server.cpp Co-authored-by: Boris Zbarsky Co-authored-by: Boris Zbarsky --- .../localization-configuration-server.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/app/clusters/localization-configuration-server/localization-configuration-server.cpp b/src/app/clusters/localization-configuration-server/localization-configuration-server.cpp index 6892016ed07d18..750f28192adb7e 100644 --- a/src/app/clusters/localization-configuration-server/localization-configuration-server.cpp +++ b/src/app/clusters/localization-configuration-server/localization-configuration-server.cpp @@ -97,6 +97,8 @@ CHIP_ERROR LocalizationConfigurationAttrAccess::Read(const ConcreteReadAttribute // Pre-change callbacks for cluster attributes // ============================================================================= +using Status = Protocols::InteractionModel::Status; + static Protocols::InteractionModel::Status emberAfPluginLocalizationConfigurationOnActiveLocaleChange(EndpointId EndpointId, CharSpan newLangtag) { @@ -108,19 +110,12 @@ static Protocols::InteractionModel::Status emberAfPluginLocalizationConfiguratio { if (locale.data_equal(newLangtag)) { - return Protocols::InteractionModel::Status::Success; + return Status::Success; } } } - return Protocols::InteractionModel::Status::InvalidValue; -} - -static Protocols::InteractionModel::Status -emberAfPluginLocalizationConfigurationOnUnhandledAttributeChange(EndpointId EndpointId, EmberAfAttributeType attrType, - uint16_t attrSize, uint8_t * attrValue) -{ - return Protocols::InteractionModel::Status::Success; + return Status::InvalidValue; } Protocols::InteractionModel::Status MatterLocalizationConfigurationClusterServerPreAttributeChangedCallback( @@ -134,12 +129,10 @@ Protocols::InteractionModel::Status MatterLocalizationConfigurationClusterServer // TODO:: allow fromZclString for CharSpan as well and use that here auto langtag = CharSpan(Uint8::to_char(&value[1]), static_cast(value[0])); res = emberAfPluginLocalizationConfigurationOnActiveLocaleChange(attributePath.mEndpointId, langtag); + break; } - break; - default: - res = - emberAfPluginLocalizationConfigurationOnUnhandledAttributeChange(attributePath.mEndpointId, attributeType, size, value); + res = Status::Success; break; }