diff --git a/src/app/MessageDef/AttributeDataIB.cpp b/src/app/MessageDef/AttributeDataIB.cpp index 2290455dc19b94..9eb0ef7d03ee71 100644 --- a/src/app/MessageDef/AttributeDataIB.cpp +++ b/src/app/MessageDef/AttributeDataIB.cpp @@ -187,7 +187,7 @@ AttributeDataIB::Parser::ParseData(TLV::TLVReader & aReader, int aDepth) const CHIP_ERROR AttributeDataIB::Parser::CheckSchemaValidity() const { CHIP_ERROR err = CHIP_NO_ERROR; - int TagPresenceMask = 0; + int tagPresenceMask = 0; TLV::TLVReader reader; PRETTY_PRINT("AttributeDataIB ="); @@ -207,8 +207,8 @@ CHIP_ERROR AttributeDataIB::Parser::CheckSchemaValidity() const { case to_underlying(Tag::kDataVersion): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kDataVersion))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kDataVersion)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kDataVersion))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kDataVersion)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING @@ -221,8 +221,8 @@ CHIP_ERROR AttributeDataIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kPath): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kPath)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kPath)); { AttributePathIB::Parser path; ReturnErrorOnFailure(path.Init(reader)); @@ -234,8 +234,8 @@ CHIP_ERROR AttributeDataIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kData): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kData))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kData)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kData))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kData)); PRETTY_PRINT_INCDEPTH(); ReturnErrorOnFailure(ParseData(reader, 0)); @@ -253,16 +253,9 @@ CHIP_ERROR AttributeDataIB::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { // check for required fields: - const int RequiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kData)); + const int requiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kData)); - if ((TagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_ELEMENT; - } + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_IB; } ReturnErrorOnFailure(err); return reader.ExitContainer(mOuterContainerType); diff --git a/src/app/MessageDef/AttributePathIB.cpp b/src/app/MessageDef/AttributePathIB.cpp index 8acda5afbf6079..6750471d849a0e 100644 --- a/src/app/MessageDef/AttributePathIB.cpp +++ b/src/app/MessageDef/AttributePathIB.cpp @@ -33,7 +33,7 @@ namespace app { CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const { CHIP_ERROR err = CHIP_NO_ERROR; - int TagPresenceMask = 0; + int tagPresenceMask = 0; TLV::TLVReader reader; PRETTY_PRINT("AttributePathIB ="); @@ -53,8 +53,8 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const { case to_underlying(Tag::kEnableTagCompression): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEnableTagCompression))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kEnableTagCompression)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEnableTagCompression))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kEnableTagCompression)); #if CHIP_DETAIL_LOGGING { bool enableTagCompression; @@ -66,8 +66,8 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const case to_underlying(Tag::kNode): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kNode))), err = CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kNode)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kNode))), err = CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kNode)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING @@ -80,8 +80,8 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kEndpoint): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEndpoint))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kEndpoint)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEndpoint))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kEndpoint)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING { @@ -93,8 +93,8 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kCluster): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kCluster))), err = CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kCluster)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kCluster))), err = CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kCluster)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING @@ -107,8 +107,8 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kAttribute): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kAttribute))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kAttribute)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kAttribute))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kAttribute)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING { @@ -120,8 +120,8 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kListIndex): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kListIndex))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kListIndex)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kListIndex))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kListIndex)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType() || TLV::kTLVType_Null == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING @@ -149,10 +149,10 @@ CHIP_ERROR AttributePathIB::Parser::CheckSchemaValidity() const // if we have exhausted this container if (CHIP_END_OF_TLV == err) { - if ((TagPresenceMask & (1 << to_underlying(Tag::kAttribute))) == 0 && - (TagPresenceMask & (1 << to_underlying(Tag::kListIndex))) != 0) + if ((tagPresenceMask & (1 << to_underlying(Tag::kAttribute))) == 0 && + (tagPresenceMask & (1 << to_underlying(Tag::kListIndex))) != 0) { - err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; } else { @@ -214,7 +214,7 @@ CHIP_ERROR AttributePathIB::Parser::GetListIndex(ConcreteDataAttributePath & aAt else { // TODO: Add ListOperation::ReplaceItem support. (Attribute path with valid list index) - err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; } } else if (CHIP_END_OF_TLV == err) diff --git a/src/app/MessageDef/AttributeReportIB.cpp b/src/app/MessageDef/AttributeReportIB.cpp index f631eea9be09ab..7f4a5c5f6e8342 100644 --- a/src/app/MessageDef/AttributeReportIB.cpp +++ b/src/app/MessageDef/AttributeReportIB.cpp @@ -32,7 +32,7 @@ namespace app { CHIP_ERROR AttributeReportIB::Parser::CheckSchemaValidity() const { CHIP_ERROR err = CHIP_NO_ERROR; - int TagPresenceMask = 0; + int tagPresenceMask = 0; TLV::TLVReader reader; PRETTY_PRINT("AttributeReportIB ="); @@ -52,8 +52,8 @@ CHIP_ERROR AttributeReportIB::Parser::CheckSchemaValidity() const { case to_underlying(Tag::kAttributeStatus): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kAttributeStatus))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kAttributeStatus)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kAttributeStatus))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kAttributeStatus)); { AttributeStatusIB::Parser attributeStatus; ReturnErrorOnFailure(attributeStatus.Init(reader)); @@ -65,8 +65,8 @@ CHIP_ERROR AttributeReportIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kAttributeData): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kAttributeData))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kAttributeData)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kAttributeData))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kAttributeData)); { AttributeDataIB::Parser attributeData; ReturnErrorOnFailure(attributeData.Init(reader)); @@ -91,12 +91,12 @@ CHIP_ERROR AttributeReportIB::Parser::CheckSchemaValidity() const const int CheckDataField = 1 << to_underlying(Tag::kAttributeData); const int CheckStatusField = (1 << to_underlying(Tag::kAttributeStatus)); - if ((TagPresenceMask & CheckDataField) == CheckDataField && (TagPresenceMask & CheckStatusField) == CheckStatusField) + if ((tagPresenceMask & CheckDataField) == CheckDataField && (tagPresenceMask & CheckStatusField) == CheckStatusField) { // kAttributeData and kAttributeStatus both exist err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB; } - else if ((TagPresenceMask & CheckDataField) != CheckDataField && (TagPresenceMask & CheckStatusField) != CheckStatusField) + else if ((tagPresenceMask & CheckDataField) != CheckDataField && (tagPresenceMask & CheckStatusField) != CheckStatusField) { // kPath and kErrorStatus not exist err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB; diff --git a/src/app/MessageDef/AttributeStatusIB.cpp b/src/app/MessageDef/AttributeStatusIB.cpp index 5be63360438cb0..a77f514f488c90 100644 --- a/src/app/MessageDef/AttributeStatusIB.cpp +++ b/src/app/MessageDef/AttributeStatusIB.cpp @@ -31,7 +31,7 @@ namespace app { CHIP_ERROR AttributeStatusIB::Parser::CheckSchemaValidity() const { CHIP_ERROR err = CHIP_NO_ERROR; - int TagPresenceMask = 0; + int tagPresenceMask = 0; TLV::TLVReader reader; PRETTY_PRINT("AttributeStatusIB ="); @@ -51,8 +51,8 @@ CHIP_ERROR AttributeStatusIB::Parser::CheckSchemaValidity() const { case to_underlying(Tag::kPath): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kPath)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kPath)); { AttributePathIB::Parser path; ReturnErrorOnFailure(path.Init(reader)); @@ -64,8 +64,8 @@ CHIP_ERROR AttributeStatusIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kErrorStatus): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kErrorStatus))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kErrorStatus)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kErrorStatus))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kErrorStatus)); { StatusIB::Parser errorStatus; ReturnErrorOnFailure(errorStatus.Init(reader)); @@ -86,16 +86,8 @@ CHIP_ERROR AttributeStatusIB::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { - const int RequiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kErrorStatus)); - - if ((TagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_IB; - } + const int requiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kErrorStatus)); + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_IB; } ReturnErrorOnFailure(err); diff --git a/src/app/MessageDef/ClusterPathIB.cpp b/src/app/MessageDef/ClusterPathIB.cpp index a7105263dc5e9b..d92efbb7decce6 100644 --- a/src/app/MessageDef/ClusterPathIB.cpp +++ b/src/app/MessageDef/ClusterPathIB.cpp @@ -101,16 +101,9 @@ CHIP_ERROR ClusterPathIB::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { // check for required fields: - const int RequiredFields = (1 << to_underlying(Tag::kCluster)); + const int requiredFields = (1 << to_underlying(Tag::kCluster)); - if ((tagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_CLUSTER_PATH_IB; - } + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_CLUSTER_PATH_IB; } ReturnErrorOnFailure(err); diff --git a/src/app/MessageDef/CommandDataIB.cpp b/src/app/MessageDef/CommandDataIB.cpp index 680baf87dea199..e0d3c6f777f8f9 100644 --- a/src/app/MessageDef/CommandDataIB.cpp +++ b/src/app/MessageDef/CommandDataIB.cpp @@ -203,7 +203,7 @@ CommandDataIB::Parser::ParseFields(TLV::TLVReader & aReader, int aDepth) const CHIP_ERROR CommandDataIB::Parser::CheckSchemaValidity() const { CHIP_ERROR err = CHIP_NO_ERROR; - int TagPresenceMask = 0; + int tagPresenceMask = 0; TLV::TLVReader reader; PRETTY_PRINT("CommandDataIB ="); @@ -224,8 +224,8 @@ CHIP_ERROR CommandDataIB::Parser::CheckSchemaValidity() const { case to_underlying(Tag::kPath): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kPath)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kPath)); { CommandPathIB::Parser path; ReturnErrorOnFailure(path.Init(reader)); @@ -237,8 +237,8 @@ CHIP_ERROR CommandDataIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kFields): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kFields))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kFields)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kFields))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kFields)); ReturnErrorOnFailure(ParseFields(reader, 0)); break; default: @@ -252,16 +252,8 @@ CHIP_ERROR CommandDataIB::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { - const int RequiredFields = 1 << to_underlying(Tag::kPath); - - if ((TagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB; - } + const int requiredFields = 1 << to_underlying(Tag::kPath); + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB; } ReturnErrorOnFailure(err); diff --git a/src/app/MessageDef/CommandPathIB.cpp b/src/app/MessageDef/CommandPathIB.cpp index 9d7411a53a30a8..8d84cea05ada30 100644 --- a/src/app/MessageDef/CommandPathIB.cpp +++ b/src/app/MessageDef/CommandPathIB.cpp @@ -35,7 +35,7 @@ namespace app { CHIP_ERROR CommandPathIB::Parser::CheckSchemaValidity() const { CHIP_ERROR err = CHIP_NO_ERROR; - int TagPresenceMask = 0; + int tagPresenceMask = 0; TLV::TLVReader reader; PRETTY_PRINT("CommandPathIB ="); PRETTY_PRINT("{"); @@ -54,8 +54,8 @@ CHIP_ERROR CommandPathIB::Parser::CheckSchemaValidity() const { case to_underlying(Tag::kEndpointId): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEndpointId))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kEndpointId)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEndpointId))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kEndpointId)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING @@ -68,8 +68,8 @@ CHIP_ERROR CommandPathIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kClusterId): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kClusterId))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kClusterId)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kClusterId))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kClusterId)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING { @@ -81,8 +81,8 @@ CHIP_ERROR CommandPathIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kCommandId): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kCommandId))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kCommandId)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kCommandId))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kCommandId)); VerifyOrReturnError(chip::TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING { @@ -103,17 +103,10 @@ CHIP_ERROR CommandPathIB::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { // check for required fields: - const uint16_t RequiredFields = + const uint16_t requiredFields = (1 << to_underlying(Tag::kEndpointId)) | (1 << to_underlying(Tag::kCommandId)) | (1 << to_underlying(Tag::kClusterId)); - if ((TagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_COMMAND_PATH_IB; - } + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_COMMAND_PATH_IB; } ReturnErrorOnFailure(err); return reader.ExitContainer(mOuterContainerType); diff --git a/src/app/MessageDef/CommandStatusIB.cpp b/src/app/MessageDef/CommandStatusIB.cpp index 8ba1a39292cffe..4bdda7a95ef94e 100644 --- a/src/app/MessageDef/CommandStatusIB.cpp +++ b/src/app/MessageDef/CommandStatusIB.cpp @@ -31,7 +31,7 @@ namespace app { CHIP_ERROR CommandStatusIB::Parser::CheckSchemaValidity() const { CHIP_ERROR err = CHIP_NO_ERROR; - int TagPresenceMask = 0; + int tagPresenceMask = 0; TLV::TLVReader reader; PRETTY_PRINT("CommandStatusIB ="); @@ -51,8 +51,8 @@ CHIP_ERROR CommandStatusIB::Parser::CheckSchemaValidity() const { case to_underlying(Tag::kPath): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kPath)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kPath)); { CommandPathIB::Parser path; ReturnErrorOnFailure(path.Init(reader)); @@ -64,8 +64,8 @@ CHIP_ERROR CommandStatusIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kErrorStatus): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kErrorStatus))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kErrorStatus)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kErrorStatus))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kErrorStatus)); { StatusIB::Parser errorStatus; ReturnErrorOnFailure(errorStatus.Init(reader)); @@ -86,16 +86,8 @@ CHIP_ERROR CommandStatusIB::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { - const int RequiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kErrorStatus)); - - if ((TagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_COMMAND_STATUS_IB; - } + const int requiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kErrorStatus)); + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_COMMAND_STATUS_IB; } ReturnErrorOnFailure(err); diff --git a/src/app/MessageDef/DataVersionFilterIB.cpp b/src/app/MessageDef/DataVersionFilterIB.cpp index fee0ace6e4154a..fd041467d8f953 100644 --- a/src/app/MessageDef/DataVersionFilterIB.cpp +++ b/src/app/MessageDef/DataVersionFilterIB.cpp @@ -92,16 +92,8 @@ CHIP_ERROR DataVersionFilterIB::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { // check for required fields: - const int RequiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kDataVersion)); - - if ((tagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_DATA_VERSION_FILTER_IB; - } + const int requiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kDataVersion)); + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_DATA_VERSION_FILTER_IB; } ReturnErrorOnFailure(err); return reader.ExitContainer(mOuterContainerType); diff --git a/src/app/MessageDef/EventDataIB.cpp b/src/app/MessageDef/EventDataIB.cpp index 0f1efb93fdb20a..3f426a2f93d8be 100644 --- a/src/app/MessageDef/EventDataIB.cpp +++ b/src/app/MessageDef/EventDataIB.cpp @@ -182,7 +182,7 @@ EventDataIB::Parser::ParseData(TLV::TLVReader & aReader, int aDepth) const CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const { CHIP_ERROR err = CHIP_NO_ERROR; - int TagPresenceMask = 0; + int tagPresenceMask = 0; TLV::TLVReader reader; PRETTY_PRINT("EventDataIB ="); @@ -202,8 +202,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const { case to_underlying(Tag::kPath): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kPath)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kPath)); { EventPathIB::Parser path; ReturnErrorOnFailure(path.Init(reader)); @@ -215,8 +215,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kEventNumber): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEventNumber))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kEventNumber)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEventNumber))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kEventNumber)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING @@ -229,8 +229,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kPriority): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kPriority))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kPriority)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kPriority))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kPriority)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING @@ -243,8 +243,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kEpochTimestamp): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEpochTimestamp))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kEpochTimestamp)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEpochTimestamp))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kEpochTimestamp)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); @@ -259,8 +259,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const case to_underlying(Tag::kSystemTimestamp): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kSystemTimestamp))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kSystemTimestamp)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kSystemTimestamp))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kSystemTimestamp)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); @@ -274,8 +274,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kDeltaEpochTimestamp): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kDeltaEpochTimestamp))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kDeltaEpochTimestamp)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kDeltaEpochTimestamp))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kDeltaEpochTimestamp)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING @@ -288,8 +288,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kDeltaSystemTimestamp): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kDeltaSystemTimestamp))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kDeltaSystemTimestamp)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kDeltaSystemTimestamp))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kDeltaSystemTimestamp)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); @@ -303,8 +303,8 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kData): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kData))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kData)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kData))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kData)); PRETTY_PRINT_INCDEPTH(); ReturnErrorOnFailure(ParseData(reader, 0)); @@ -322,17 +322,9 @@ CHIP_ERROR EventDataIB::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { // check for required fields: - const int RequiredFields = + const int requiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kPriority)) | (1 << to_underlying(Tag::kData)); - - if ((TagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB; - } + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB; } ReturnErrorOnFailure(err); return reader.ExitContainer(mOuterContainerType); @@ -386,13 +378,13 @@ CHIP_ERROR EventDataIB::Parser::ProcessEventPath(EventPathIB::Parser & aEventPat { // The ReportData must contain a concrete event path CHIP_ERROR err = aEventPath.GetEndpoint(&(aConcreteEventPath.mEndpointId)); - VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH); + VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB); err = aEventPath.GetCluster(&(aConcreteEventPath.mClusterId)); - VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH); + VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB); err = aEventPath.GetEvent(&(aConcreteEventPath.mEventId)); - VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH); + VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB); return CHIP_NO_ERROR; } diff --git a/src/app/MessageDef/EventFilterIB.cpp b/src/app/MessageDef/EventFilterIB.cpp index 6868d7821d3c06..c0779e62c5aa15 100644 --- a/src/app/MessageDef/EventFilterIB.cpp +++ b/src/app/MessageDef/EventFilterIB.cpp @@ -35,7 +35,7 @@ namespace app { CHIP_ERROR EventFilterIB::Parser::CheckSchemaValidity() const { CHIP_ERROR err = CHIP_NO_ERROR; - int TagPresenceMask = 0; + int tagPresenceMask = 0; TLV::TLVReader reader; PRETTY_PRINT("EventFilterIB ="); @@ -55,8 +55,8 @@ CHIP_ERROR EventFilterIB::Parser::CheckSchemaValidity() const { case to_underlying(Tag::kNode): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kNode))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kNode)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kNode))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kNode)); #if CHIP_DETAIL_LOGGING { NodeId node; @@ -67,8 +67,8 @@ CHIP_ERROR EventFilterIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kEventMin): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEventMin))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kEventMin)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEventMin))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kEventMin)); #if CHIP_DETAIL_LOGGING { uint64_t eventMin; @@ -88,16 +88,8 @@ CHIP_ERROR EventFilterIB::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { - const int RequiredFields = (1 << to_underlying(Tag::kEventMin)); - - if ((TagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_EVENT_FILTER_IB; - } + const int requiredFields = (1 << to_underlying(Tag::kEventMin)); + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_EVENT_FILTER_IB; } ReturnErrorOnFailure(err); diff --git a/src/app/MessageDef/EventPathIB.cpp b/src/app/MessageDef/EventPathIB.cpp index 29df4104ca6982..70c8ca2103e0e1 100644 --- a/src/app/MessageDef/EventPathIB.cpp +++ b/src/app/MessageDef/EventPathIB.cpp @@ -32,7 +32,7 @@ namespace app { CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const { CHIP_ERROR err = CHIP_NO_ERROR; - int TagPresenceMask = 0; + int tagPresenceMask = 0; TLV::TLVReader reader; PRETTY_PRINT("EventPath ="); @@ -52,8 +52,8 @@ CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const { case to_underlying(Tag::kNode): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kNode))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kNode)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kNode))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kNode)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING { @@ -65,8 +65,8 @@ CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kEndpoint): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEndpoint))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kEndpoint)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEndpoint))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kEndpoint)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING { @@ -78,8 +78,8 @@ CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kCluster): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kCluster))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kCluster)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kCluster))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kCluster)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING @@ -92,8 +92,8 @@ CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kEvent): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEvent))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kEvent)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEvent))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kEvent)); VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING @@ -106,8 +106,8 @@ CHIP_ERROR EventPathIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kIsUrgent): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kIsUrgent))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kIsUrgent)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kIsUrgent))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kIsUrgent)); VerifyOrReturnError(TLV::kTLVType_Boolean == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING @@ -160,9 +160,9 @@ CHIP_ERROR EventPathIB::Parser::GetEvent(EventId * const apEvent) const CHIP_ERROR EventPathIB::Parser::GetEventPath(ConcreteEventPath * const apPath) const { - VerifyOrReturnError(GetEndpoint(&(apPath->mEndpointId)) == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH); - VerifyOrReturnError(GetCluster(&(apPath->mClusterId)) == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH); - VerifyOrReturnError(GetEvent(&(apPath->mEventId)) == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH); + VerifyOrReturnError(GetEndpoint(&(apPath->mEndpointId)) == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB); + VerifyOrReturnError(GetCluster(&(apPath->mClusterId)) == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB); + VerifyOrReturnError(GetEvent(&(apPath->mEventId)) == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB); return CHIP_NO_ERROR; } diff --git a/src/app/MessageDef/EventPathIB.h b/src/app/MessageDef/EventPathIB.h index 9d6e3787de61d4..32b7948dfc6d54 100644 --- a/src/app/MessageDef/EventPathIB.h +++ b/src/app/MessageDef/EventPathIB.h @@ -124,7 +124,7 @@ class Parser : public ListParser * @param [in] apPath A pointer to the path to fill in. * * @return #CHIP_NO_ERROR on success - * #CHIP_ERROR_IM_MALFORMED_EVENT_PATH if the path from the reader is not a valid concrere event path. + * #CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB if the path from the reader is not a valid concrere event path. */ CHIP_ERROR GetEventPath(ConcreteEventPath * const apPath) const; }; diff --git a/src/app/MessageDef/EventReportIB.cpp b/src/app/MessageDef/EventReportIB.cpp index d2ff49e8bac7c5..ce59866612684a 100644 --- a/src/app/MessageDef/EventReportIB.cpp +++ b/src/app/MessageDef/EventReportIB.cpp @@ -32,7 +32,7 @@ namespace app { CHIP_ERROR EventReportIB::Parser::CheckSchemaValidity() const { CHIP_ERROR err = CHIP_NO_ERROR; - int TagPresenceMask = 0; + int tagPresenceMask = 0; TLV::TLVReader reader; PRETTY_PRINT("EventReportIB ="); @@ -52,8 +52,8 @@ CHIP_ERROR EventReportIB::Parser::CheckSchemaValidity() const { case to_underlying(Tag::kEventStatus): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEventStatus))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kEventStatus)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEventStatus))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kEventStatus)); { EventStatusIB::Parser eventStatus; ReturnErrorOnFailure(eventStatus.Init(reader)); @@ -65,8 +65,8 @@ CHIP_ERROR EventReportIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kEventData): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEventData))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kEventData)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kEventData))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kEventData)); { EventDataIB::Parser eventData; ReturnErrorOnFailure(eventData.Init(reader)); @@ -91,12 +91,12 @@ CHIP_ERROR EventReportIB::Parser::CheckSchemaValidity() const const int CheckDataField = 1 << to_underlying(Tag::kEventData); const int CheckStatusField = (1 << to_underlying(Tag::kEventStatus)); - if ((TagPresenceMask & CheckDataField) == CheckDataField && (TagPresenceMask & CheckStatusField) == CheckStatusField) + if ((tagPresenceMask & CheckDataField) == CheckDataField && (tagPresenceMask & CheckStatusField) == CheckStatusField) { // kEventData and kEventStatus both exist err = CHIP_ERROR_IM_MALFORMED_EVENT_REPORT_IB; } - else if ((TagPresenceMask & CheckDataField) != CheckDataField && (TagPresenceMask & CheckStatusField) != CheckStatusField) + else if ((tagPresenceMask & CheckDataField) != CheckDataField && (tagPresenceMask & CheckStatusField) != CheckStatusField) { // kEventData and kErrorStatus not exist err = CHIP_ERROR_IM_MALFORMED_EVENT_REPORT_IB; diff --git a/src/app/MessageDef/EventStatusIB.cpp b/src/app/MessageDef/EventStatusIB.cpp index feff195ac884aa..5b831ac4fe7094 100644 --- a/src/app/MessageDef/EventStatusIB.cpp +++ b/src/app/MessageDef/EventStatusIB.cpp @@ -31,7 +31,7 @@ namespace app { CHIP_ERROR EventStatusIB::Parser::CheckSchemaValidity() const { CHIP_ERROR err = CHIP_NO_ERROR; - int TagPresenceMask = 0; + int tagPresenceMask = 0; TLV::TLVReader reader; PRETTY_PRINT("EventStatusIB ="); @@ -51,8 +51,8 @@ CHIP_ERROR EventStatusIB::Parser::CheckSchemaValidity() const { case to_underlying(Tag::kPath): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kPath)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kPath))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kPath)); { EventPathIB::Parser path; ReturnErrorOnFailure(path.Init(reader)); @@ -64,8 +64,8 @@ CHIP_ERROR EventStatusIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kErrorStatus): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kErrorStatus))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kErrorStatus)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kErrorStatus))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kErrorStatus)); { StatusIB::Parser errorStatus; ReturnErrorOnFailure(errorStatus.Init(reader)); @@ -86,16 +86,8 @@ CHIP_ERROR EventStatusIB::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { - const int RequiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kErrorStatus)); - - if ((TagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB; - } + const int requiredFields = (1 << to_underlying(Tag::kPath)) | (1 << to_underlying(Tag::kErrorStatus)); + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB; } ReturnErrorOnFailure(err); diff --git a/src/app/MessageDef/InvokeRequestMessage.cpp b/src/app/MessageDef/InvokeRequestMessage.cpp index b423fe91531394..5df97196c6e4c3 100644 --- a/src/app/MessageDef/InvokeRequestMessage.cpp +++ b/src/app/MessageDef/InvokeRequestMessage.cpp @@ -99,17 +99,9 @@ CHIP_ERROR InvokeRequestMessage::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { - const int RequiredFields = (1 << to_underlying(Tag::kSuppressResponse)) | (1 << to_underlying(Tag::kTimedRequest)) | + const int requiredFields = (1 << to_underlying(Tag::kSuppressResponse)) | (1 << to_underlying(Tag::kTimedRequest)) | (1 << to_underlying(Tag::kInvokeRequests)); - - if ((tagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_INVOKE_REQUEST_MESSAGE; - } + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_INVOKE_REQUEST_MESSAGE; } ReturnErrorOnFailure(err); diff --git a/src/app/MessageDef/InvokeResponseIB.cpp b/src/app/MessageDef/InvokeResponseIB.cpp index 8d9763505f23a5..438bc976a8c27b 100644 --- a/src/app/MessageDef/InvokeResponseIB.cpp +++ b/src/app/MessageDef/InvokeResponseIB.cpp @@ -29,7 +29,7 @@ namespace app { CHIP_ERROR InvokeResponseIB::Parser::CheckSchemaValidity() const { CHIP_ERROR err = CHIP_NO_ERROR; - int TagPresenceMask = 0; + int tagPresenceMask = 0; TLV::TLVReader reader; PRETTY_PRINT("InvokeResponseIB ="); @@ -49,8 +49,8 @@ CHIP_ERROR InvokeResponseIB::Parser::CheckSchemaValidity() const { case to_underlying(Tag::kCommand): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kCommand))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kCommand)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kCommand))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kCommand)); { CommandDataIB::Parser command; ReturnErrorOnFailure(command.Init(reader)); @@ -62,8 +62,8 @@ CHIP_ERROR InvokeResponseIB::Parser::CheckSchemaValidity() const break; case to_underlying(Tag::kStatus): // check if this tag has appeared before - VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kStatus))), CHIP_ERROR_INVALID_TLV_TAG); - TagPresenceMask |= (1 << to_underlying(Tag::kStatus)); + VerifyOrReturnError(!(tagPresenceMask & (1 << to_underlying(Tag::kStatus))), CHIP_ERROR_INVALID_TLV_TAG); + tagPresenceMask |= (1 << to_underlying(Tag::kStatus)); { CommandStatusIB::Parser status; ReturnErrorOnFailure(status.Init(reader)); @@ -89,13 +89,13 @@ CHIP_ERROR InvokeResponseIB::Parser::CheckSchemaValidity() const const int CheckCommandField = 1 << to_underlying(Tag::kCommand); const int CheckStatusField = (1 << to_underlying(Tag::kStatus)); - if ((TagPresenceMask & CheckCommandField) == CheckCommandField && (TagPresenceMask & CheckStatusField) == CheckStatusField) + if ((tagPresenceMask & CheckCommandField) == CheckCommandField && (tagPresenceMask & CheckStatusField) == CheckStatusField) { // kPath and kErrorStatus both exist err = CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_IB; } - else if ((TagPresenceMask & CheckCommandField) != CheckCommandField && - (TagPresenceMask & CheckStatusField) != CheckStatusField) + else if ((tagPresenceMask & CheckCommandField) != CheckCommandField && + (tagPresenceMask & CheckStatusField) != CheckStatusField) { // kPath and kErrorStatus not exist err = CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_IB; diff --git a/src/app/MessageDef/InvokeResponseMessage.cpp b/src/app/MessageDef/InvokeResponseMessage.cpp index c1f0513c719bd5..39a18a456513a7 100644 --- a/src/app/MessageDef/InvokeResponseMessage.cpp +++ b/src/app/MessageDef/InvokeResponseMessage.cpp @@ -86,16 +86,9 @@ CHIP_ERROR InvokeResponseMessage::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { - const int RequiredFields = (1 << to_underlying(Tag::kSuppressResponse)) | (1 << to_underlying(Tag::kInvokeResponses)); - - if ((tagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_MESSAGE; - } + const int requiredFields = (1 << to_underlying(Tag::kSuppressResponse)) | (1 << to_underlying(Tag::kInvokeResponses)); + err = + (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_MESSAGE; } ReturnErrorOnFailure(err); @@ -112,8 +105,7 @@ CHIP_ERROR InvokeResponseMessage::Parser::GetInvokeResponses(InvokeResponseIBs:: { TLV::TLVReader reader; ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kInvokeResponses)), reader)); - ReturnErrorOnFailure(apStatus->Init(reader)); - return CHIP_NO_ERROR; + return apStatus->Init(reader); } InvokeResponseMessage::Builder & InvokeResponseMessage::Builder::SuppressResponse(const bool aSuppressResponse) diff --git a/src/app/MessageDef/ReadRequestMessage.cpp b/src/app/MessageDef/ReadRequestMessage.cpp index 0f25328584e7f6..0f47a956a90ee6 100644 --- a/src/app/MessageDef/ReadRequestMessage.cpp +++ b/src/app/MessageDef/ReadRequestMessage.cpp @@ -125,16 +125,8 @@ CHIP_ERROR ReadRequestMessage::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { - const int RequiredFields = (1 << to_underlying(Tag::kIsFabricFiltered)); - - if ((tagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_READ_REQUEST_MESSAGE; - } + const int requiredFields = (1 << to_underlying(Tag::kIsFabricFiltered)); + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_READ_REQUEST_MESSAGE; } ReturnErrorOnFailure(err); diff --git a/src/app/MessageDef/StatusIB.cpp b/src/app/MessageDef/StatusIB.cpp index a171bcb9decdb0..9a9ba96598c972 100644 --- a/src/app/MessageDef/StatusIB.cpp +++ b/src/app/MessageDef/StatusIB.cpp @@ -68,7 +68,7 @@ CHIP_ERROR StatusIB::Parser::DecodeStatusIB(StatusIB & aStatusIB) const CHIP_ERROR StatusIB::Parser::CheckSchemaValidity() const { CHIP_ERROR err = CHIP_NO_ERROR; - int TagPresenceMask = 0; + int tagPresenceMask = 0; TLV::TLVReader reader; PRETTY_PRINT("StatusIB ="); @@ -82,9 +82,9 @@ CHIP_ERROR StatusIB::Parser::CheckSchemaValidity() const { continue; } - if (!(TagPresenceMask & (1 << to_underlying(Tag::kStatus)))) + if (!(tagPresenceMask & (1 << to_underlying(Tag::kStatus)))) { - TagPresenceMask |= (1 << to_underlying(Tag::kStatus)); + tagPresenceMask |= (1 << to_underlying(Tag::kStatus)); #if CHIP_DETAIL_LOGGING { @@ -94,9 +94,9 @@ CHIP_ERROR StatusIB::Parser::CheckSchemaValidity() const } #endif // CHIP_DETAIL_LOGGING } - else if (!(TagPresenceMask & (1 << to_underlying(Tag::kClusterStatus)))) + else if (!(tagPresenceMask & (1 << to_underlying(Tag::kClusterStatus)))) { - TagPresenceMask |= (1 << to_underlying(Tag::kClusterStatus)); + tagPresenceMask |= (1 << to_underlying(Tag::kClusterStatus)); #if CHIP_DETAIL_LOGGING { @@ -118,16 +118,8 @@ CHIP_ERROR StatusIB::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { // check for required fields: - const int RequiredFields = (1 << to_underlying(Tag::kStatus)); - - if ((TagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_STATUS_CODE; - } + const int requiredFields = (1 << to_underlying(Tag::kStatus)); + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_STATUS_IB; } ReturnErrorOnFailure(err); return reader.ExitContainer(mOuterContainerType); diff --git a/src/app/MessageDef/StatusResponseMessage.cpp b/src/app/MessageDef/StatusResponseMessage.cpp index a9af045280f8cf..a20fc4d5faa7ce 100644 --- a/src/app/MessageDef/StatusResponseMessage.cpp +++ b/src/app/MessageDef/StatusResponseMessage.cpp @@ -69,15 +69,8 @@ CHIP_ERROR StatusResponseMessage::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { const int requiredFields = (1 << to_underlying(Tag::kStatus)); - - if ((tagPresenceMask & requiredFields) == requiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE; - } + err = + (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE; } ReturnErrorOnFailure(err); return reader.ExitContainer(mOuterContainerType); diff --git a/src/app/MessageDef/SubscribeRequestMessage.cpp b/src/app/MessageDef/SubscribeRequestMessage.cpp index 1ff061f8ed87d3..abc83a9661e8e1 100644 --- a/src/app/MessageDef/SubscribeRequestMessage.cpp +++ b/src/app/MessageDef/SubscribeRequestMessage.cpp @@ -157,17 +157,11 @@ CHIP_ERROR SubscribeRequestMessage::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { - const int RequiredFields = (1 << to_underlying(Tag::kIsFabricFiltered)) | (1 << to_underlying(Tag::kKeepSubscriptions)) | + const int requiredFields = (1 << to_underlying(Tag::kIsFabricFiltered)) | (1 << to_underlying(Tag::kKeepSubscriptions)) | (1 << to_underlying(Tag::kMinIntervalFloorSeconds)) | (1 << to_underlying(Tag::kMaxIntervalCeilingSeconds)); - if ((tagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_REQUEST_MESSAGE; - } + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR + : CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_REQUEST_MESSAGE; } ReturnErrorOnFailure(err); diff --git a/src/app/MessageDef/SubscribeResponseMessage.cpp b/src/app/MessageDef/SubscribeResponseMessage.cpp index d857f5c13c5264..c7cc524c47865d 100644 --- a/src/app/MessageDef/SubscribeResponseMessage.cpp +++ b/src/app/MessageDef/SubscribeResponseMessage.cpp @@ -91,17 +91,10 @@ CHIP_ERROR SubscribeResponseMessage::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { - const uint16_t RequiredFields = (1 << to_underlying(Tag::kSubscriptionId)) | + const uint16_t requiredFields = (1 << to_underlying(Tag::kSubscriptionId)) | (1 << to_underlying(Tag::kMinIntervalFloorSeconds)) | (1 << to_underlying(Tag::kMaxIntervalCeilingSeconds)); - - if ((tagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_RESPONSE_MESSAGE; - } + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR + : CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_RESPONSE_MESSAGE; } ReturnErrorOnFailure(err); return reader.ExitContainer(mOuterContainerType); diff --git a/src/app/MessageDef/TimedRequestMessage.cpp b/src/app/MessageDef/TimedRequestMessage.cpp index 957cd5e4d6c905..8ee9467646b2ab 100644 --- a/src/app/MessageDef/TimedRequestMessage.cpp +++ b/src/app/MessageDef/TimedRequestMessage.cpp @@ -64,16 +64,8 @@ CHIP_ERROR TimedRequestMessage::Parser::CheckSchemaValidity() const PRETTY_PRINT(""); if (CHIP_END_OF_TLV == err) { - const int RequiredFields = (1 << to_underlying(Tag::kTimeoutMs)); - - if ((tagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_TIMED_REQUEST_MESSAGE; - } + const int requiredFields = (1 << to_underlying(Tag::kTimeoutMs)); + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_TIMED_REQUEST_MESSAGE; } ReturnErrorOnFailure(err); return reader.ExitContainer(mOuterContainerType); diff --git a/src/app/MessageDef/WriteRequestMessage.cpp b/src/app/MessageDef/WriteRequestMessage.cpp index b367530711d097..25f547e2570640 100644 --- a/src/app/MessageDef/WriteRequestMessage.cpp +++ b/src/app/MessageDef/WriteRequestMessage.cpp @@ -116,16 +116,8 @@ CHIP_ERROR WriteRequestMessage::Parser::CheckSchemaValidity() const if (CHIP_END_OF_TLV == err) { - const int RequiredFields = ((1 << to_underlying(Tag::kTimedRequest)) | (1 << to_underlying(Tag::kWriteRequests))); - - if ((tagPresenceMask & RequiredFields) == RequiredFields) - { - err = CHIP_NO_ERROR; - } - else - { - err = CHIP_ERROR_IM_MALFORMED_WRITE_REQUEST_MESSAGE; - } + const int requiredFields = ((1 << to_underlying(Tag::kTimedRequest)) | (1 << to_underlying(Tag::kWriteRequests))); + err = (tagPresenceMask & requiredFields) == requiredFields ? CHIP_NO_ERROR : CHIP_ERROR_IM_MALFORMED_WRITE_REQUEST_MESSAGE; } ReturnErrorOnFailure(err); diff --git a/src/app/ReadClient.cpp b/src/app/ReadClient.cpp index 6a0c50702b2bcd..d58e41aca2f0e0 100644 --- a/src/app/ReadClient.cpp +++ b/src/app/ReadClient.cpp @@ -291,7 +291,7 @@ CHIP_ERROR ReadClient::GenerateEventPaths(EventPathIBs::Builder & aEventPathsBui { for (auto & event : aEventPaths) { - VerifyOrReturnError(event.IsValidEventPath(), CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH); + VerifyOrReturnError(event.IsValidEventPath(), CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB); EventPathIB::Builder & path = aEventPathsBuilder.CreatePath(); ReturnErrorOnFailure(aEventPathsBuilder.GetError()); ReturnErrorOnFailure(path.Encode(event)); @@ -306,7 +306,7 @@ CHIP_ERROR ReadClient::GenerateAttributePaths(AttributePathIBs::Builder & aAttri { for (auto & attribute : aAttributePaths) { - VerifyOrReturnError(attribute.IsValidAttributePath(), CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH); + VerifyOrReturnError(attribute.IsValidAttributePath(), CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB); AttributePathIB::Builder & path = aAttributePathIBsBuilder.CreatePath(); ReturnErrorOnFailure(aAttributePathIBsBuilder.GetError()); ReturnErrorOnFailure(path.Encode(attribute)); @@ -603,13 +603,13 @@ CHIP_ERROR ReadClient::ProcessAttributePath(AttributePathIB::Parser & aAttribute CHIP_ERROR err = CHIP_NO_ERROR; // The ReportData must contain a concrete attribute path err = aAttributePathParser.GetEndpoint(&(aAttributePath.mEndpointId)); - VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH); + VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB); err = aAttributePathParser.GetCluster(&(aAttributePath.mClusterId)); - VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH); + VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB); err = aAttributePathParser.GetAttribute(&(aAttributePath.mAttributeId)); - VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH); + VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB); err = aAttributePathParser.GetListIndex(aAttributePath); - VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH); + VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB); return CHIP_NO_ERROR; } diff --git a/src/app/ReadHandler.cpp b/src/app/ReadHandler.cpp index ee4be7d293fa64..8b722edbcfb83f 100644 --- a/src/app/ReadHandler.cpp +++ b/src/app/ReadHandler.cpp @@ -530,7 +530,7 @@ CHIP_ERROR ReadHandler::ProcessEventPaths(EventPathIBs::Parser & aEventPathsPars err = path.GetEndpoint(&(event.mEndpointId)); if (err == CHIP_NO_ERROR) { - VerifyOrReturnError(!event.HasWildcardEndpointId(), err = CHIP_ERROR_IM_MALFORMED_EVENT_PATH); + VerifyOrReturnError(!event.HasWildcardEndpointId(), err = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB); } else if (err == CHIP_END_OF_TLV) { @@ -541,7 +541,7 @@ CHIP_ERROR ReadHandler::ProcessEventPaths(EventPathIBs::Parser & aEventPathsPars err = path.GetCluster(&(event.mClusterId)); if (err == CHIP_NO_ERROR) { - VerifyOrReturnError(!event.HasWildcardClusterId(), err = CHIP_ERROR_IM_MALFORMED_EVENT_PATH); + VerifyOrReturnError(!event.HasWildcardClusterId(), err = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB); } else if (err == CHIP_END_OF_TLV) { @@ -556,7 +556,7 @@ CHIP_ERROR ReadHandler::ProcessEventPaths(EventPathIBs::Parser & aEventPathsPars } else if (err == CHIP_NO_ERROR) { - VerifyOrReturnError(!event.HasWildcardEventId(), err = CHIP_ERROR_IM_MALFORMED_EVENT_PATH); + VerifyOrReturnError(!event.HasWildcardEventId(), err = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB); } ReturnErrorOnFailure(err); diff --git a/src/app/tests/TestReadInteraction.cpp b/src/app/tests/TestReadInteraction.cpp index 0a2c322ebd83ed..2d261b86db7e54 100644 --- a/src/app/tests/TestReadInteraction.cpp +++ b/src/app/tests/TestReadInteraction.cpp @@ -537,7 +537,7 @@ void TestReadInteraction::TestReadClientGenerateInvalidAttributePathList(nlTestS AttributePathIBs::Builder & attributePathListBuilder = request.CreateAttributeRequests(); err = readClient.GenerateAttributePaths(attributePathListBuilder, attributePaths); - NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH); + NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB); } void TestReadInteraction::TestReadClientInvalidReport(nlTestSuite * apSuite, void * apContext) @@ -564,7 +564,7 @@ void TestReadInteraction::TestReadClientInvalidReport(nlTestSuite * apSuite, voi GenerateReportData(apSuite, apContext, buf, true /*aNeedInvalidReport*/, true /* aSuppressResponse*/); err = readClient.ProcessReportData(std::move(buf)); - NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH); + NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB); } void TestReadInteraction::TestReadHandlerInvalidAttributePath(nlTestSuite * apSuite, void * apContext) diff --git a/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt b/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt index 9053c1768b7de4..2f0b429f6a3337 100644 --- a/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt +++ b/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt @@ -36,7 +36,7 @@ while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) if (argExists[currentDecodeTagId]) { ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); - TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; + TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB; break; } else diff --git a/src/controller/java/AndroidCallbacks.cpp b/src/controller/java/AndroidCallbacks.cpp index 424fac43ee1605..afc2670be5d794 100644 --- a/src/controller/java/AndroidCallbacks.cpp +++ b/src/controller/java/AndroidCallbacks.cpp @@ -222,7 +222,7 @@ void ReportCallback::OnAttributeData(const app::ConcreteDataAttributePath & aPat jobject value = DecodeAttributeValue(aPath, readerForJavaObject, &err); // If we don't know this attribute, just skip it. - VerifyOrReturn(err != CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH); + VerifyOrReturn(err != CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB); VerifyOrReturn(err == CHIP_NO_ERROR, ReportError(attributePathObj, err)); VerifyOrReturn(!env->ExceptionCheck(), env->ExceptionDescribe(), ReportError(attributePathObj, CHIP_JNI_ERROR_EXCEPTION_THROWN)); diff --git a/src/controller/java/templates/CHIPAttributeTLVValueDecoder-src.zapt b/src/controller/java/templates/CHIPAttributeTLVValueDecoder-src.zapt index 81bb283e4a3183..b8bbcfddd7737f 100644 --- a/src/controller/java/templates/CHIPAttributeTLVValueDecoder-src.zapt +++ b/src/controller/java/templates/CHIPAttributeTLVValueDecoder-src.zapt @@ -56,14 +56,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } {{/chip_server_cluster_attributes}} default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; } {{/chip_client_clusters}} default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } return nullptr; diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 2bc28e290647b7..39767ccb6bae25 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -394,7 +394,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -506,7 +506,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -663,7 +663,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -920,7 +920,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -1138,7 +1138,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -1318,7 +1318,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -1490,7 +1490,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -1893,7 +1893,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -2050,7 +2050,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -2271,7 +2271,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -2398,7 +2398,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -2666,7 +2666,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -2970,7 +2970,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -3334,7 +3334,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -4293,7 +4293,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -4441,7 +4441,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -4675,7 +4675,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -4787,7 +4787,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -5285,7 +5285,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -5562,7 +5562,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -5830,7 +5830,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -6121,7 +6121,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -6276,7 +6276,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -6469,7 +6469,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -6678,7 +6678,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -7058,7 +7058,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -7337,7 +7337,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -7464,7 +7464,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -7606,7 +7606,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -7821,7 +7821,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -7933,7 +7933,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -8290,7 +8290,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -8411,7 +8411,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -8523,7 +8523,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -8707,7 +8707,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -8992,7 +8992,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -9284,7 +9284,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -9547,7 +9547,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -9611,7 +9611,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -9785,7 +9785,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -9942,7 +9942,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -10136,7 +10136,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -10278,7 +10278,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -10594,7 +10594,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -11186,7 +11186,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -11322,7 +11322,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -11563,7 +11563,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -12146,7 +12146,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -12339,7 +12339,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -12526,7 +12526,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -12748,7 +12748,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -12905,7 +12905,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -13079,7 +13079,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -13224,7 +13224,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -15620,7 +15620,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -15946,7 +15946,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -16103,7 +16103,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -17621,7 +17621,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -17763,7 +17763,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -17842,7 +17842,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -17973,7 +17973,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -18097,7 +18097,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -18439,7 +18439,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -18877,13 +18877,13 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } return nullptr; diff --git a/src/darwin/Framework/CHIP/CHIPDevice.mm b/src/darwin/Framework/CHIP/CHIPDevice.mm index ed9499f4664fde..510cb8553c8d13 100644 --- a/src/darwin/Framework/CHIP/CHIPDevice.mm +++ b/src/darwin/Framework/CHIP/CHIPDevice.mm @@ -1423,7 +1423,7 @@ - (instancetype)initWithPath:(const ConcreteEventPath &)path } else { CHIP_ERROR err; value = CHIPDecodeEventPayload(aEventHeader.mPath, *apData, &err); - if (err == CHIP_ERROR_IM_MALFORMED_EVENT_PATH) { + if (err == CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB) { // We don't know this event; just skip it. return; } @@ -1465,7 +1465,7 @@ - (instancetype)initWithPath:(const ConcreteEventPath &)path } else { CHIP_ERROR err; value = CHIPDecodeAttributeValue(aPath, *apData, &err); - if (err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH) { + if (err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB) { // We don't know this attribute; just skip it. return; } diff --git a/src/darwin/Framework/CHIP/templates/CHIPAttributeTLVValueDecoder-src.zapt b/src/darwin/Framework/CHIP/templates/CHIPAttributeTLVValueDecoder-src.zapt index 102be84e662142..347d18014dcdc0 100644 --- a/src/darwin/Framework/CHIP/templates/CHIPAttributeTLVValueDecoder-src.zapt +++ b/src/darwin/Framework/CHIP/templates/CHIPAttributeTLVValueDecoder-src.zapt @@ -38,14 +38,14 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader } {{/chip_server_cluster_attributes}} default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; } {{/chip_client_clusters}} default: { - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } } diff --git a/src/darwin/Framework/CHIP/templates/CHIPEventTLVValueDecoder-src.zapt b/src/darwin/Framework/CHIP/templates/CHIPEventTLVValueDecoder-src.zapt index a93042336ac313..5c48cf27b8c14a 100644 --- a/src/darwin/Framework/CHIP/templates/CHIPEventTLVValueDecoder-src.zapt +++ b/src/darwin/Framework/CHIP/templates/CHIPEventTLVValueDecoder-src.zapt @@ -54,14 +54,14 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea {{/zcl_events}} default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; } {{/chip_client_clusters}} default: { - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } } diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm index 5c83256a9f656a..0a41ed48f15e88 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm @@ -283,7 +283,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -392,7 +392,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -534,7 +534,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -750,7 +750,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -910,7 +910,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -1061,7 +1061,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -1280,7 +1280,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -1611,7 +1611,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -1819,7 +1819,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -1975,7 +1975,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -2095,7 +2095,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -2296,7 +2296,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -2570,7 +2570,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -2799,7 +2799,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -3520,7 +3520,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -3668,7 +3668,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -3883,7 +3883,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -3992,7 +3992,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -4615,7 +4615,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -6132,7 +6132,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -6352,7 +6352,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -6590,7 +6590,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -6731,7 +6731,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -6896,7 +6896,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -7061,7 +7061,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -7380,7 +7380,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -7591,7 +7591,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -7711,7 +7711,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -7842,7 +7842,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -8022,7 +8022,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -8131,7 +8131,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -8414,7 +8414,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -8562,7 +8562,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -8671,7 +8671,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -8825,7 +8825,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -9037,7 +9037,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -9261,7 +9261,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -9487,7 +9487,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -9596,7 +9596,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -9771,7 +9771,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -10012,7 +10012,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -10180,7 +10180,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -10311,7 +10311,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -10547,7 +10547,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -11042,7 +11042,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -11177,7 +11177,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -11409,7 +11409,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -11843,7 +11843,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -12008,7 +12008,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -12187,7 +12187,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -12362,7 +12362,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -12504,7 +12504,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -12654,7 +12654,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -12819,7 +12819,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -14293,7 +14293,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -14985,7 +14985,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -15127,7 +15127,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -16090,7 +16090,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -16247,7 +16247,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -16367,7 +16367,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -16508,7 +16508,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -16628,7 +16628,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -16900,7 +16900,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; @@ -17283,13 +17283,13 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return value; } default: - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } break; } default: { - *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; break; } } diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPEventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPEventTLVValueDecoder.mm index 5d3c55fe6103d5..073315ad6e0583 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPEventTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPEventTLVValueDecoder.mm @@ -207,7 +207,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea } default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -217,7 +217,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -227,7 +227,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -237,7 +237,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -247,7 +247,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -257,7 +257,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -267,7 +267,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -337,7 +337,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea } default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -347,7 +347,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -357,7 +357,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -385,7 +385,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea } default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -456,7 +456,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea } default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -526,7 +526,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea } default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -536,7 +536,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -546,7 +546,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -556,7 +556,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -566,7 +566,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -576,7 +576,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -853,7 +853,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea } default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -863,7 +863,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -873,7 +873,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -883,7 +883,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -893,7 +893,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -903,7 +903,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -913,7 +913,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1102,7 +1102,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea } default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1112,7 +1112,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1122,7 +1122,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1132,7 +1132,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1142,7 +1142,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1152,7 +1152,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1162,7 +1162,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1172,7 +1172,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1182,7 +1182,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1192,7 +1192,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1202,7 +1202,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1212,7 +1212,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1222,7 +1222,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1232,7 +1232,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1346,7 +1346,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea } default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1356,7 +1356,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1366,7 +1366,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1376,7 +1376,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1386,7 +1386,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1396,7 +1396,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1406,7 +1406,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1416,7 +1416,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1646,7 +1646,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea } default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1656,7 +1656,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1666,7 +1666,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1700,7 +1700,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea } default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1846,7 +1846,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea } default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1856,7 +1856,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1866,7 +1866,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1987,7 +1987,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea } default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -1997,7 +1997,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -2007,7 +2007,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -2036,7 +2036,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea } default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -2046,7 +2046,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -2056,7 +2056,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -2066,7 +2066,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -2076,7 +2076,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -2147,7 +2147,7 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea } default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; @@ -2157,13 +2157,13 @@ id CHIPDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRea switch (aPath.mEventId) { default: - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } break; } default: { - *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH; + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; break; } } diff --git a/src/lib/core/CHIPError.cpp b/src/lib/core/CHIPError.cpp index bfd008b2b00161..69ae85cb9041ce 100644 --- a/src/lib/core/CHIPError.cpp +++ b/src/lib/core/CHIPError.cpp @@ -215,6 +215,18 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err) case CHIP_ERROR_INSUFFICIENT_PRIVILEGE.AsInteger(): desc = "Required privilege was insufficient during an operation"; break; + case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB.AsInteger(): + desc = "Malformed Interacton Model Attribute Report IB"; + break; + case CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB.AsInteger(): + desc = "Malformed Interacton Model Command Data IB"; + break; + case CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB.AsInteger(): + desc = "Malformed Interacton Model Status IB"; + break; + case CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE.AsInteger(): + desc = "Malformed Interacton Model Status Response IB"; + break; case CHIP_ERROR_INVALID_PATH_LIST.AsInteger(): desc = "Invalid TLV path list"; break; @@ -515,7 +527,7 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err) case CHIP_ERROR_TOO_MANY_SHARED_SESSION_END_NODES.AsInteger(): desc = "Too many shared session end nodes"; break; - case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_ELEMENT.AsInteger(): + case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_IB.AsInteger(): desc = "Malformed Interaction Model Attribute DataElement"; break; case CHIP_ERROR_WRONG_CERT_TYPE.AsInteger(): @@ -587,25 +599,22 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err) case CHIP_ERROR_MDNS_COLLISION.AsInteger(): desc = "mDNS collision"; break; - case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH.AsInteger(): + case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB.AsInteger(): desc = "Malformed Interacton Model Attribute Path IB"; break; - case CHIP_ERROR_IM_MALFORMED_EVENT_PATH.AsInteger(): + case CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB.AsInteger(): desc = "Malformed Interacton Model Event Path IB"; break; case CHIP_ERROR_IM_MALFORMED_COMMAND_PATH_IB.AsInteger(): desc = "Malformed Interacton Model Command Path IB"; break; - case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_ELEMENT.AsInteger(): - desc = "Malformed Interacton Model Attribute DataElement"; - break; - case CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT.AsInteger(): - desc = "Malformed Interacton Model Attribute DataElement"; + case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_IB.AsInteger(): + desc = "Malformed Interacton Model Attribute Status IB"; break; case CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB.AsInteger(): desc = "Malformed Interacton Model Event DataElement"; break; - case CHIP_ERROR_IM_MALFORMED_STATUS_CODE.AsInteger(): + case CHIP_ERROR_IM_MALFORMED_STATUS_IB.AsInteger(): desc = "Malformed Interacton Model Status Code"; break; case CHIP_ERROR_PEER_NODE_NOT_FOUND.AsInteger(): @@ -719,21 +728,6 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err) case CHIP_ERROR_MISSING_URI_SEPARATOR.AsInteger(): desc = "The URI separator is missing"; break; - case CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE.AsInteger(): - desc = "Malformed Interaction Model Status Response Message"; - break; - case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB.AsInteger(): - desc = "Malformed Interaction Model Attribute Report IB"; - break; - case CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_IB.AsInteger(): - desc = "Malformed Interaction Model Attribute Status IB"; - break; - case CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB.AsInteger(): - desc = "Malformed Interaction Model Command Data IB"; - break; - case CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB.AsInteger(): - desc = "Malformed Interaction Model Event Status IB"; - break; } #endif // !CHIP_CONFIG_SHORT_ERROR_STR diff --git a/src/lib/core/CHIPError.h b/src/lib/core/CHIPError.h index 2e3c2da1d3799c..5e0f023708afe0 100644 --- a/src/lib/core/CHIPError.h +++ b/src/lib/core/CHIPError.h @@ -1527,12 +1527,32 @@ using CHIP_ERROR = ::chip::ChipError; */ #define CHIP_ERROR_INSUFFICIENT_PRIVILEGE CHIP_CORE_ERROR(0x79) +/** + * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB + * + * @brief + * The Attribute Report IB is malformed: it does not contain + * the required elements + */ +#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB CHIP_CORE_ERROR(0x7a) -// unused CHIP_CORE_ERROR(0x7a) - -// unused CHIP_CORE_ERROR(0x7b) +/** + * @def CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB + * + * @brief + * The Event Status IB is malformed: itf does not contain + * the required elements + */ +#define CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB CHIP_CORE_ERROR(0x7b) -// unused CHIP_CORE_ERROR(0x7c) +/** + * @def CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE + * + * @brief + * The Status Response Message is malformed: it does not contain + * the required elements + */ +#define CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE CHIP_CORE_ERROR(0x7c) // unused CHIP_CORE_ERROR(0x7d) @@ -1808,13 +1828,13 @@ using CHIP_ERROR = ::chip::ChipError; #define CHIP_ERROR_TOO_MANY_SHARED_SESSION_END_NODES CHIP_CORE_ERROR(0x9b) /** - * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_ELEMENT + * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_IB * * @brief - * The Attribute DataElement is malformed: it either does not contain + * The Attribute Data IB is malformed: it does not contain * the required elements */ -#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_ELEMENT CHIP_CORE_ERROR(0x9c) +#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_IB CHIP_CORE_ERROR(0x9c) /** * @def CHIP_ERROR_WRONG_CERT_TYPE @@ -2022,67 +2042,67 @@ using CHIP_ERROR = ::chip::ChipError; #define CHIP_ERROR_MDNS_COLLISION CHIP_CORE_ERROR(0xb4) /** - * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH + * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB * * @brief - * The Attribute path IB is malformed: it either does not contain + * The Attribute path IB is malformed: it does not contain * the required path */ -#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH CHIP_CORE_ERROR(0xb5) +#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB CHIP_CORE_ERROR(0xb5) /** - * @def CHIP_ERROR_IM_MALFORMED_EVENT_PATH + * @def CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB * * @brief - * The Event Path IB is malformed: it either does not contain + * The Event Path IB is malformed: it does not contain * the required elements */ -#define CHIP_ERROR_IM_MALFORMED_EVENT_PATH CHIP_CORE_ERROR(0xb6) +#define CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB CHIP_CORE_ERROR(0xb6) /** * @def CHIP_ERROR_IM_MALFORMED_COMMAND_PATH_IB * * @brief - * The Command Path IB is malformed: it either does not contain + * The Command Path IB is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_COMMAND_PATH_IB CHIP_CORE_ERROR(0xb7) /** - * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_ELEMENT + * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_IB * * @brief - * The Attribute DataElement is malformed: it either does not contain + * The Attribute Status IB is malformed: it does not contain * the required elements */ -#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_ELEMENT CHIP_CORE_ERROR(0xb8) +#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_IB CHIP_CORE_ERROR(0xb8) /** - * @def CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT + * @def CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB * * @brief - * The Attribute DataElement is malformed: it either does not contain + * The Command Data IB is malformed: it does not contain * the required elements */ -#define CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT CHIP_CORE_ERROR(0xb9) +#define CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB CHIP_CORE_ERROR(0xb9) /** * @def CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB * * @brief - * The Event DataElement is malformed: it either does not contain + * The Event Data IB is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB CHIP_CORE_ERROR(0xba) /** - * @def CHIP_ERROR_IM_MALFORMED_STATUS_CODE + * @def CHIP_ERROR_IM_MALFORMED_STATUS_IB * * @brief - * The Attribute DataElement is malformed: it either does not contain + * The Attribute Data IB is malformed: it does not contain * the required elements */ -#define CHIP_ERROR_IM_MALFORMED_STATUS_CODE CHIP_CORE_ERROR(0xbb) +#define CHIP_ERROR_IM_MALFORMED_STATUS_IB CHIP_CORE_ERROR(0xbb) /** * @def CHIP_ERROR_PEER_NODE_NOT_FOUND @@ -2213,7 +2233,7 @@ using CHIP_ERROR = ::chip::ChipError; * @def CHIP_ERROR_IM_MALFORMED_COMMAND_STATUS_IB * * @brief - * The CommandStatusCodeIB is malformed: it either does not contain + * The Command Status IB is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_COMMAND_STATUS_IB CHIP_CORE_ERROR(0xcb) @@ -2222,7 +2242,7 @@ using CHIP_ERROR = ::chip::ChipError; * @def CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_IB * * @brief - * The InvokeResponseIB is malformed: it either does not contain + * The Invoke Response IB is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_IB CHIP_CORE_ERROR(0xcc) @@ -2231,7 +2251,7 @@ using CHIP_ERROR = ::chip::ChipError; * @def CHIP_ERROR_IM_MALFORMED_INVOKE_REQUEST_MESSAGE * * @brief - * The InvokeResponseMessage is malformed: it either does not contain + * The Invoke Request Message is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_INVOKE_REQUEST_MESSAGE CHIP_CORE_ERROR(0xcd) @@ -2240,7 +2260,7 @@ using CHIP_ERROR = ::chip::ChipError; * @def CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_MESSAGE * * @brief - * The InvokeResponseMessage is malformed: it either does not contain + * The Invoke Response Message is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_INVOKE_RESPONSE_MESSAGE CHIP_CORE_ERROR(0xce) @@ -2249,7 +2269,7 @@ using CHIP_ERROR = ::chip::ChipError; * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_MESSAGE * * @brief - * The InvokeResponseMessage is malformed: it either does not contain + * The Attribute Response Message is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_MESSAGE CHIP_CORE_ERROR(0xcf) @@ -2258,7 +2278,7 @@ using CHIP_ERROR = ::chip::ChipError; * @def CHIP_ERROR_IM_MALFORMED_WRITE_REQUEST_MESSAGE * * @brief - * The WriteRequestMessage is malformed: it either does not contain + * The Write Request Message is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_WRITE_REQUEST_MESSAGE CHIP_CORE_ERROR(0xd0) @@ -2267,7 +2287,7 @@ using CHIP_ERROR = ::chip::ChipError; * @def CHIP_ERROR_IM_MALFORMED_EVENT_FILTER_IB * * @brief - * The EventFilter IB is malformed: it either does not contain + * The Event Filter IB is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_EVENT_FILTER_IB CHIP_CORE_ERROR(0xd1) @@ -2276,7 +2296,7 @@ using CHIP_ERROR = ::chip::ChipError; * @def CHIP_ERROR_IM_MALFORMED_READ_REQUEST_MESSAGE * * @brief - * The ReadRequestMessage is malformed: it either does not contain + * The Read Request Message is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_READ_REQUEST_MESSAGE CHIP_CORE_ERROR(0xd2) @@ -2285,7 +2305,7 @@ using CHIP_ERROR = ::chip::ChipError; * @def CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_REQUEST_MESSAGE * * @brief - * The SubscribeRequestMessage is malformed: it either does not contain + * The Subscribe Request Message is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_REQUEST_MESSAGE CHIP_CORE_ERROR(0xd3) @@ -2294,7 +2314,7 @@ using CHIP_ERROR = ::chip::ChipError; * @def CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_RESPONSE_MESSAGE * * @brief - * The SubscribeResponseMessage is malformed: it either does not contain + * The Subscribe Response Message is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_SUBSCRIBE_RESPONSE_MESSAGE CHIP_CORE_ERROR(0xd4) @@ -2303,7 +2323,7 @@ using CHIP_ERROR = ::chip::ChipError; * @def CHIP_ERROR_IM_MALFORMED_EVENT_REPORT_IB * * @brief - * The EventReportIB is malformed: it either does not contain + * The Event Report IB is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_EVENT_REPORT_IB CHIP_CORE_ERROR(0xd5) @@ -2312,7 +2332,7 @@ using CHIP_ERROR = ::chip::ChipError; * @def CHIP_ERROR_IM_MALFORMED_CLUSTER_PATH_IB * * @brief - * The ClusterPathIB is malformed: it either does not contain + * The Cluster Path IB is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_CLUSTER_PATH_IB CHIP_CORE_ERROR(0xd6) @@ -2321,7 +2341,7 @@ using CHIP_ERROR = ::chip::ChipError; * @def CHIP_ERROR_IM_MALFORMED_DATA_VERSION_FILTER_IB * * @brief - * The DataVersionFilterIB is malformed: it either does not contain + * The Data Version Filter IB is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_DATA_VERSION_FILTER_IB CHIP_CORE_ERROR(0xd7) @@ -2338,7 +2358,7 @@ using CHIP_ERROR = ::chip::ChipError; * @def CHIP_ERROR_IM_MALFORMED_TIMED_REQUEST_MESSAGE * * @brief - * The Attribute DataElement is malformed: it either does not contain + * The Timed Request Message is malformed: it does not contain * the required elements */ #define CHIP_ERROR_IM_MALFORMED_TIMED_REQUEST_MESSAGE CHIP_CORE_ERROR(0xd9) @@ -2401,51 +2421,6 @@ using CHIP_ERROR = ::chip::ChipError; */ #define CHIP_ERROR_MISSING_URI_SEPARATOR CHIP_CORE_ERROR(0xe0) -/** - * @def CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE - * - * @brief - * The Attribute DataElement is malformed: it either does not contain - * the required elements - */ -#define CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE CHIP_CORE_ERROR(0xe1) - -/** - * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB - * - * @brief - * The AttributeReportIB is malformed: it either does not contain - * the required elements - */ -#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB CHIP_CORE_ERROR(0xe2) - -/** - * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB - * - * @brief - * The AttributeStatusIB is malformed: it either does not contain - * the required elements - */ -#define CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_IB CHIP_CORE_ERROR(0xe3) - -/** - * @def CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB - * - * @brief - * The CommandDataIB is malformed: it either does not contain - * the required elements - */ -#define CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB CHIP_CORE_ERROR(0xe4) - -/** - * @def CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB - * - * @brief - * The Event Status IB is malformed: it either does not contain - * the required elements - */ -#define CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB CHIP_CORE_ERROR(0xe5) - // clang-format on // !!!!! IMPORTANT !!!!! If you add new CHIP errors, please update the translation diff --git a/src/lib/core/tests/TestCHIPErrorStr.cpp b/src/lib/core/tests/TestCHIPErrorStr.cpp index eb009e397ba9b9..259d6bb416f492 100644 --- a/src/lib/core/tests/TestCHIPErrorStr.cpp +++ b/src/lib/core/tests/TestCHIPErrorStr.cpp @@ -167,6 +167,12 @@ static const CHIP_ERROR kTestElements[] = CHIP_ERROR_CANCELLED, CHIP_ERROR_DRBG_ENTROPY_SOURCE_FAILED, CHIP_ERROR_TLV_TAG_NOT_FOUND, + CHIP_ERROR_MISSING_SECURE_SESSION, + CHIP_ERROR_INVALID_ADMIN_SUBJECT, + CHIP_ERROR_INSUFFICIENT_PRIVILEGE, + CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB, + CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB, + CHIP_ERROR_IM_MALFORMED_STATUS_RESPONSE_MESSAGE, CHIP_ERROR_FABRIC_EXISTS, CHIP_ERROR_KEY_NOT_FOUND_FROM_PEER, CHIP_ERROR_WRONG_ENCRYPTION_TYPE_FROM_PEER, @@ -197,7 +203,7 @@ static const CHIP_ERROR kTestElements[] = CHIP_ERROR_UNAUTHORIZED_KEY_EXPORT_RESPONSE, CHIP_ERROR_EXPORTED_KEY_AUTHENTICATION_FAILED, CHIP_ERROR_TOO_MANY_SHARED_SESSION_END_NODES, - CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_ELEMENT, + CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_DATA_IB, CHIP_ERROR_WRONG_CERT_TYPE, CHIP_ERROR_DEFAULT_EVENT_HANDLER_NOT_CALLED, CHIP_ERROR_PERSISTED_STORAGE_FAILED, @@ -221,13 +227,13 @@ static const CHIP_ERROR kTestElements[] = CHIP_ERROR_UNSUPPORTED_WIRELESS_REGULATORY_DOMAIN, CHIP_ERROR_UNSUPPORTED_WIRELESS_OPERATING_LOCATION, CHIP_ERROR_MDNS_COLLISION, - CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH, - CHIP_ERROR_IM_MALFORMED_EVENT_PATH, + CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB, + CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB, CHIP_ERROR_IM_MALFORMED_COMMAND_PATH_IB, - CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_ELEMENT, - CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT, + CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_IB, + CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB, CHIP_ERROR_IM_MALFORMED_EVENT_DATA_IB, - CHIP_ERROR_IM_MALFORMED_STATUS_CODE, + CHIP_ERROR_IM_MALFORMED_STATUS_IB, CHIP_ERROR_PEER_NODE_NOT_FOUND, CHIP_ERROR_HSM, CHIP_ERROR_IM_STATUS_CODE_RECEIVED, @@ -258,8 +264,6 @@ static const CHIP_ERROR kTestElements[] = CHIP_ERROR_INVALID_FILE_IDENTIFIER, CHIP_ERROR_BUSY, CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_REPORT_IB, - CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_STATUS_IB, - CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB, CHIP_ERROR_IM_MALFORMED_EVENT_STATUS_IB, }; // clang-format on diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index b870b76adeb678..2f363d697f6ce9 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -371,7 +371,10 @@ { (uint16_t) 0xC8, (uint16_t) 0x64, (uint16_t) 0x3E8 }, /* nullable_range_restricted_int16u */ \ { (uint16_t) -0x64, (uint16_t) -0x96, (uint16_t) 0xC8 }, /* nullable_range_restricted_int16s */ \ \ - /* Endpoint: 2, Cluster: On/Off (server) */ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x2 } /* StartUpOnOff */ \ + /* Endpoint: 2, Cluster: On/Off (server) */ \ + { \ + (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x2 \ + } /* StartUpOnOff */ \ } #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask @@ -2845,7 +2848,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0100, 1 }, { 0x0100, 1 }, { 0xF002, 1 } \ + { 0x0016, 1 }, { 0x0100, 1 }, { 0x0100, 1 }, \ + { \ + 0xF002, 1 \ + } \ } // Array of device type offsets diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h index 3a35866f397669..2f2b67b5ddcc01 100644 --- a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h @@ -2241,7 +2241,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0100, 1 }, { 0x0100, 1 }, { 0xF002, 1 } \ + { 0x0016, 1 }, { 0x0100, 1 }, { 0x0100, 1 }, \ + { \ + 0xF002, 1 \ + } \ } // Array of device type offsets diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 7d9c297c6b497a..290ea5324939be 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -27,11 +27,9 @@ namespace chip { namespace app { namespace Clusters { -namespace PowerConfiguration { -} // namespace PowerConfiguration +namespace PowerConfiguration {} // namespace PowerConfiguration -namespace DeviceTemperatureConfiguration { -} // namespace DeviceTemperatureConfiguration +namespace DeviceTemperatureConfiguration {} // namespace DeviceTemperatureConfiguration namespace Identify { @@ -82,8 +80,7 @@ using IdentifyIdentifyType = EmberAfIdentifyIdentifyType; #endif } // namespace Identify -namespace Groups { -} // namespace Groups +namespace Groups {} // namespace Groups namespace Scenes { @@ -162,8 +159,7 @@ enum class SceneFeatures : uint32_t }; } // namespace OnOff -namespace OnOffSwitchConfiguration { -} // namespace OnOffSwitchConfiguration +namespace OnOffSwitchConfiguration {} // namespace OnOffSwitchConfiguration namespace LevelControl { @@ -202,17 +198,13 @@ enum class LevelControlFeature : uint32_t }; } // namespace LevelControl -namespace Alarms { -} // namespace Alarms +namespace Alarms {} // namespace Alarms -namespace Time { -} // namespace Time +namespace Time {} // namespace Time -namespace BinaryInputBasic { -} // namespace BinaryInputBasic +namespace BinaryInputBasic {} // namespace BinaryInputBasic -namespace PowerProfile { -} // namespace PowerProfile +namespace PowerProfile {} // namespace PowerProfile namespace ApplianceControl { @@ -270,14 +262,11 @@ enum class RemoteEnableFlagsAndDeviceStatus2 : uint8_t }; } // namespace ApplianceControl -namespace PulseWidthModulation { -} // namespace PulseWidthModulation +namespace PulseWidthModulation {} // namespace PulseWidthModulation -namespace Descriptor { -} // namespace Descriptor +namespace Descriptor {} // namespace Descriptor -namespace Binding { -} // namespace Binding +namespace Binding {} // namespace Binding namespace AccessControl { @@ -308,8 +297,7 @@ enum class Privilege : uint8_t }; } // namespace AccessControl -namespace PollControl { -} // namespace PollControl +namespace PollControl {} // namespace PollControl namespace BridgedActions { @@ -367,8 +355,7 @@ enum class CommandBits : uint16_t }; } // namespace BridgedActions -namespace Basic { -} // namespace Basic +namespace Basic {} // namespace Basic namespace OtaSoftwareUpdateProvider { @@ -434,8 +421,7 @@ enum class OTAUpdateStateEnum : uint8_t }; } // namespace OtaSoftwareUpdateRequestor -namespace LocalizationConfiguration { -} // namespace LocalizationConfiguration +namespace LocalizationConfiguration {} // namespace LocalizationConfiguration namespace TimeFormatLocalization { @@ -481,8 +467,7 @@ enum class UnitLocalizationFeature : uint32_t }; } // namespace UnitLocalization -namespace PowerSourceConfiguration { -} // namespace PowerSourceConfiguration +namespace PowerSourceConfiguration {} // namespace PowerSourceConfiguration namespace PowerSource { @@ -754,8 +739,7 @@ using RadioFaultType = EmberAfRadioFaultType; #endif } // namespace GeneralDiagnostics -namespace SoftwareDiagnostics { -} // namespace SoftwareDiagnostics +namespace SoftwareDiagnostics {} // namespace SoftwareDiagnostics namespace ThreadNetworkDiagnostics { @@ -880,14 +864,11 @@ using PHYRateType = EmberAfPHYRateType; #endif } // namespace EthernetNetworkDiagnostics -namespace TimeSynchronization { -} // namespace TimeSynchronization +namespace TimeSynchronization {} // namespace TimeSynchronization -namespace BridgedDeviceBasic { -} // namespace BridgedDeviceBasic +namespace BridgedDeviceBasic {} // namespace BridgedDeviceBasic -namespace Switch { -} // namespace Switch +namespace Switch {} // namespace Switch namespace AdministratorCommissioning { @@ -943,23 +924,17 @@ enum class GroupKeySecurityPolicy : uint8_t }; } // namespace GroupKeyManagement -namespace FixedLabel { -} // namespace FixedLabel +namespace FixedLabel {} // namespace FixedLabel -namespace UserLabel { -} // namespace UserLabel +namespace UserLabel {} // namespace UserLabel -namespace ProxyConfiguration { -} // namespace ProxyConfiguration +namespace ProxyConfiguration {} // namespace ProxyConfiguration -namespace ProxyDiscovery { -} // namespace ProxyDiscovery +namespace ProxyDiscovery {} // namespace ProxyDiscovery -namespace ProxyValid { -} // namespace ProxyValid +namespace ProxyValid {} // namespace ProxyValid -namespace BooleanState { -} // namespace BooleanState +namespace BooleanState {} // namespace BooleanState namespace ModeSelect { @@ -970,8 +945,7 @@ enum class ModeSelectFeature : uint32_t }; } // namespace ModeSelect -namespace ShadeConfiguration { -} // namespace ShadeConfiguration +namespace ShadeConfiguration {} // namespace ShadeConfiguration namespace DoorLock { @@ -1490,8 +1464,7 @@ enum class WcSafetyStatus : uint16_t }; } // namespace WindowCovering -namespace BarrierControl { -} // namespace BarrierControl +namespace BarrierControl {} // namespace BarrierControl namespace PumpConfigurationAndControl { @@ -1666,11 +1639,9 @@ enum class WindSupportMask : uint8_t }; } // namespace FanControl -namespace DehumidificationControl { -} // namespace DehumidificationControl +namespace DehumidificationControl {} // namespace DehumidificationControl -namespace ThermostatUserInterfaceConfiguration { -} // namespace ThermostatUserInterfaceConfiguration +namespace ThermostatUserInterfaceConfiguration {} // namespace ThermostatUserInterfaceConfiguration namespace ColorControl { @@ -1814,8 +1785,7 @@ enum class ColorLoopUpdateFlags : uint8_t }; } // namespace ColorControl -namespace BallastConfiguration { -} // namespace BallastConfiguration +namespace BallastConfiguration {} // namespace BallastConfiguration namespace IlluminanceMeasurement { @@ -1827,8 +1797,7 @@ enum class LightSensorType : uint8_t }; } // namespace IlluminanceMeasurement -namespace TemperatureMeasurement { -} // namespace TemperatureMeasurement +namespace TemperatureMeasurement {} // namespace TemperatureMeasurement namespace PressureMeasurement { @@ -1839,104 +1808,71 @@ enum class PressureFeature : uint32_t }; } // namespace PressureMeasurement -namespace FlowMeasurement { -} // namespace FlowMeasurement +namespace FlowMeasurement {} // namespace FlowMeasurement -namespace RelativeHumidityMeasurement { -} // namespace RelativeHumidityMeasurement +namespace RelativeHumidityMeasurement {} // namespace RelativeHumidityMeasurement -namespace OccupancySensing { -} // namespace OccupancySensing +namespace OccupancySensing {} // namespace OccupancySensing -namespace CarbonMonoxideConcentrationMeasurement { -} // namespace CarbonMonoxideConcentrationMeasurement +namespace CarbonMonoxideConcentrationMeasurement {} // namespace CarbonMonoxideConcentrationMeasurement -namespace CarbonDioxideConcentrationMeasurement { -} // namespace CarbonDioxideConcentrationMeasurement +namespace CarbonDioxideConcentrationMeasurement {} // namespace CarbonDioxideConcentrationMeasurement -namespace EthyleneConcentrationMeasurement { -} // namespace EthyleneConcentrationMeasurement +namespace EthyleneConcentrationMeasurement {} // namespace EthyleneConcentrationMeasurement -namespace EthyleneOxideConcentrationMeasurement { -} // namespace EthyleneOxideConcentrationMeasurement +namespace EthyleneOxideConcentrationMeasurement {} // namespace EthyleneOxideConcentrationMeasurement -namespace HydrogenConcentrationMeasurement { -} // namespace HydrogenConcentrationMeasurement +namespace HydrogenConcentrationMeasurement {} // namespace HydrogenConcentrationMeasurement -namespace HydrogenSulphideConcentrationMeasurement { -} // namespace HydrogenSulphideConcentrationMeasurement +namespace HydrogenSulphideConcentrationMeasurement {} // namespace HydrogenSulphideConcentrationMeasurement -namespace NitricOxideConcentrationMeasurement { -} // namespace NitricOxideConcentrationMeasurement +namespace NitricOxideConcentrationMeasurement {} // namespace NitricOxideConcentrationMeasurement -namespace NitrogenDioxideConcentrationMeasurement { -} // namespace NitrogenDioxideConcentrationMeasurement +namespace NitrogenDioxideConcentrationMeasurement {} // namespace NitrogenDioxideConcentrationMeasurement -namespace OxygenConcentrationMeasurement { -} // namespace OxygenConcentrationMeasurement +namespace OxygenConcentrationMeasurement {} // namespace OxygenConcentrationMeasurement -namespace OzoneConcentrationMeasurement { -} // namespace OzoneConcentrationMeasurement +namespace OzoneConcentrationMeasurement {} // namespace OzoneConcentrationMeasurement -namespace SulfurDioxideConcentrationMeasurement { -} // namespace SulfurDioxideConcentrationMeasurement +namespace SulfurDioxideConcentrationMeasurement {} // namespace SulfurDioxideConcentrationMeasurement -namespace DissolvedOxygenConcentrationMeasurement { -} // namespace DissolvedOxygenConcentrationMeasurement +namespace DissolvedOxygenConcentrationMeasurement {} // namespace DissolvedOxygenConcentrationMeasurement -namespace BromateConcentrationMeasurement { -} // namespace BromateConcentrationMeasurement +namespace BromateConcentrationMeasurement {} // namespace BromateConcentrationMeasurement -namespace ChloraminesConcentrationMeasurement { -} // namespace ChloraminesConcentrationMeasurement +namespace ChloraminesConcentrationMeasurement {} // namespace ChloraminesConcentrationMeasurement -namespace ChlorineConcentrationMeasurement { -} // namespace ChlorineConcentrationMeasurement +namespace ChlorineConcentrationMeasurement {} // namespace ChlorineConcentrationMeasurement -namespace FecalColiformAndEColiConcentrationMeasurement { -} // namespace FecalColiformAndEColiConcentrationMeasurement +namespace FecalColiformAndEColiConcentrationMeasurement {} // namespace FecalColiformAndEColiConcentrationMeasurement -namespace FluorideConcentrationMeasurement { -} // namespace FluorideConcentrationMeasurement +namespace FluorideConcentrationMeasurement {} // namespace FluorideConcentrationMeasurement -namespace HaloaceticAcidsConcentrationMeasurement { -} // namespace HaloaceticAcidsConcentrationMeasurement +namespace HaloaceticAcidsConcentrationMeasurement {} // namespace HaloaceticAcidsConcentrationMeasurement -namespace TotalTrihalomethanesConcentrationMeasurement { -} // namespace TotalTrihalomethanesConcentrationMeasurement +namespace TotalTrihalomethanesConcentrationMeasurement {} // namespace TotalTrihalomethanesConcentrationMeasurement -namespace TotalColiformBacteriaConcentrationMeasurement { -} // namespace TotalColiformBacteriaConcentrationMeasurement +namespace TotalColiformBacteriaConcentrationMeasurement {} // namespace TotalColiformBacteriaConcentrationMeasurement -namespace TurbidityConcentrationMeasurement { -} // namespace TurbidityConcentrationMeasurement +namespace TurbidityConcentrationMeasurement {} // namespace TurbidityConcentrationMeasurement -namespace CopperConcentrationMeasurement { -} // namespace CopperConcentrationMeasurement +namespace CopperConcentrationMeasurement {} // namespace CopperConcentrationMeasurement -namespace LeadConcentrationMeasurement { -} // namespace LeadConcentrationMeasurement +namespace LeadConcentrationMeasurement {} // namespace LeadConcentrationMeasurement -namespace ManganeseConcentrationMeasurement { -} // namespace ManganeseConcentrationMeasurement +namespace ManganeseConcentrationMeasurement {} // namespace ManganeseConcentrationMeasurement -namespace SulfateConcentrationMeasurement { -} // namespace SulfateConcentrationMeasurement +namespace SulfateConcentrationMeasurement {} // namespace SulfateConcentrationMeasurement -namespace BromodichloromethaneConcentrationMeasurement { -} // namespace BromodichloromethaneConcentrationMeasurement +namespace BromodichloromethaneConcentrationMeasurement {} // namespace BromodichloromethaneConcentrationMeasurement -namespace BromoformConcentrationMeasurement { -} // namespace BromoformConcentrationMeasurement +namespace BromoformConcentrationMeasurement {} // namespace BromoformConcentrationMeasurement -namespace ChlorodibromomethaneConcentrationMeasurement { -} // namespace ChlorodibromomethaneConcentrationMeasurement +namespace ChlorodibromomethaneConcentrationMeasurement {} // namespace ChlorodibromomethaneConcentrationMeasurement -namespace ChloroformConcentrationMeasurement { -} // namespace ChloroformConcentrationMeasurement +namespace ChloroformConcentrationMeasurement {} // namespace ChloroformConcentrationMeasurement -namespace SodiumConcentrationMeasurement { -} // namespace SodiumConcentrationMeasurement +namespace SodiumConcentrationMeasurement {} // namespace SodiumConcentrationMeasurement namespace IasZone { @@ -2129,8 +2065,7 @@ enum class WarningInfo : uint8_t }; } // namespace IasWd -namespace WakeOnLan { -} // namespace WakeOnLan +namespace WakeOnLan {} // namespace WakeOnLan namespace Channel { @@ -2216,8 +2151,7 @@ enum class MediaInputFeature : uint32_t }; } // namespace MediaInput -namespace LowPower { -} // namespace LowPower +namespace LowPower {} // namespace LowPower namespace KeypadInput { @@ -2428,8 +2362,7 @@ enum class ApplicationStatusEnum : uint8_t }; } // namespace ApplicationBasic -namespace AccountLogin { -} // namespace AccountLogin +namespace AccountLogin {} // namespace AccountLogin namespace TestCluster { @@ -2630,11 +2563,9 @@ enum class MessagingExtendedControlMask : uint8_t }; } // namespace Messaging -namespace ApplianceIdentification { -} // namespace ApplianceIdentification +namespace ApplianceIdentification {} // namespace ApplianceIdentification -namespace MeterIdentification { -} // namespace MeterIdentification +namespace MeterIdentification {} // namespace MeterIdentification namespace ApplianceEventsAndAlert { @@ -2664,11 +2595,9 @@ enum class AlertStructure : uint32_t }; } // namespace ApplianceEventsAndAlert -namespace ApplianceStatistics { -} // namespace ApplianceStatistics +namespace ApplianceStatistics {} // namespace ApplianceStatistics -namespace ElectricalMeasurement { -} // namespace ElectricalMeasurement +namespace ElectricalMeasurement {} // namespace ElectricalMeasurement } // namespace Clusters } // namespace app diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index b2768c2842ec09..e7fa49e16a7e23 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -75,8 +75,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) namespace PowerConfiguration { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -277,14 +276,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace PowerConfiguration namespace DeviceTemperatureConfiguration { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -341,8 +338,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace DeviceTemperatureConfiguration namespace Identify { @@ -462,8 +458,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Identify namespace Groups { @@ -896,8 +891,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Groups namespace Scenes { @@ -1917,8 +1911,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Scenes namespace OnOff { @@ -2187,14 +2180,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace OnOff namespace OnOffSwitchConfiguration { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -2230,8 +2221,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace OnOffSwitchConfiguration namespace LevelControl { @@ -2661,8 +2651,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace LevelControl namespace Alarms { @@ -2931,14 +2920,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Alarms namespace Time { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -2998,14 +2985,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Time namespace BinaryInputBasic { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -3062,8 +3047,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace BinaryInputBasic namespace PowerProfile { @@ -4175,8 +4159,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace PowerProfile namespace ApplianceControl { @@ -4531,14 +4514,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ApplianceControl namespace PulseWidthModulation { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -4568,8 +4549,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace PulseWidthModulation namespace Descriptor { @@ -4620,8 +4600,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace DeviceType } // namespace Structs -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -4663,8 +4642,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Descriptor namespace Binding { @@ -4740,8 +4718,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace TargetStruct } // namespace Structs -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -4774,8 +4751,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Binding namespace AccessControl { @@ -4973,8 +4949,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace ExtensionEntry } // namespace Structs -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -5368,8 +5343,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace PollControl namespace BridgedActions { @@ -6747,8 +6721,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace OtaSoftwareUpdateProvider namespace OtaSoftwareUpdateRequestor { @@ -7059,8 +7032,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace OtaSoftwareUpdateRequestor namespace LocalizationConfiguration { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -7096,14 +7068,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace LocalizationConfiguration namespace TimeFormatLocalization { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -7142,14 +7112,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace TimeFormatLocalization namespace UnitLocalization { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -7182,14 +7150,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace UnitLocalization namespace PowerSourceConfiguration { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -7222,8 +7188,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace PowerSourceConfiguration namespace PowerSource { @@ -7362,8 +7327,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace WiredFaultChangeType } // namespace Structs -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -7486,8 +7450,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace PowerSource namespace GeneralCommissioning { @@ -7825,8 +7788,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace GeneralCommissioning namespace NetworkCommissioning { @@ -8454,8 +8416,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace NetworkCommissioning namespace DiagnosticLogs { @@ -8586,8 +8547,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace DiagnosticLogs namespace GeneralDiagnostics { @@ -10071,14 +10031,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace EthernetNetworkDiagnostics namespace TimeSynchronization { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -10108,14 +10066,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace TimeSynchronization namespace BridgedDeviceBasic { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -10336,8 +10292,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace BridgedDeviceBasic namespace Switch { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -10816,8 +10771,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace AdministratorCommissioning namespace OperationalCredentials { @@ -11496,8 +11450,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace OperationalCredentials namespace GroupKeyManagement { @@ -11964,16 +11917,13 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace GroupKeyManagement namespace FixedLabel { -namespace Structs { -} // namespace Structs +namespace Structs {} // namespace Structs -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -12006,16 +11956,13 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace FixedLabel namespace UserLabel { -namespace Structs { -} // namespace Structs +namespace Structs {} // namespace Structs -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -12048,14 +11995,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace UserLabel namespace ProxyConfiguration { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -12085,14 +12030,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ProxyConfiguration namespace ProxyDiscovery { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -12122,14 +12065,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ProxyDiscovery namespace ProxyValid { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -12159,14 +12100,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ProxyValid namespace BooleanState { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -12422,14 +12361,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ModeSelect namespace ShadeConfiguration { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -12474,8 +12411,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ShadeConfiguration namespace DoorLock { @@ -15298,8 +15234,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace WindowCovering namespace BarrierControl { @@ -15435,14 +15370,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace BarrierControl namespace PumpConfigurationAndControl { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -16553,14 +16486,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Thermostat namespace FanControl { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -16623,14 +16554,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace FanControl namespace DehumidificationControl { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -16684,14 +16613,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace DehumidificationControl namespace ThermostatUserInterfaceConfiguration { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -16730,8 +16657,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ThermostatUserInterfaceConfiguration namespace ColorControl { @@ -17918,14 +17844,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ColorControl namespace BallastConfiguration { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18003,14 +17927,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace BallastConfiguration namespace IlluminanceMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18055,14 +17977,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace IlluminanceMeasurement namespace TemperatureMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18104,14 +18024,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace TemperatureMeasurement namespace PressureMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18168,14 +18086,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace PressureMeasurement namespace FlowMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18217,14 +18133,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace FlowMeasurement namespace RelativeHumidityMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18266,14 +18180,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace RelativeHumidityMeasurement namespace OccupancySensing { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18339,14 +18251,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace OccupancySensing namespace CarbonMonoxideConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18388,14 +18298,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace CarbonMonoxideConcentrationMeasurement namespace CarbonDioxideConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18437,14 +18345,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace CarbonDioxideConcentrationMeasurement namespace EthyleneConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18486,14 +18392,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace EthyleneConcentrationMeasurement namespace EthyleneOxideConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18535,14 +18439,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace EthyleneOxideConcentrationMeasurement namespace HydrogenConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18584,14 +18486,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace HydrogenConcentrationMeasurement namespace HydrogenSulphideConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18633,14 +18533,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace HydrogenSulphideConcentrationMeasurement namespace NitricOxideConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18682,14 +18580,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace NitricOxideConcentrationMeasurement namespace NitrogenDioxideConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18731,14 +18627,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace NitrogenDioxideConcentrationMeasurement namespace OxygenConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18780,14 +18674,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace OxygenConcentrationMeasurement namespace OzoneConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18829,14 +18721,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace OzoneConcentrationMeasurement namespace SulfurDioxideConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18878,14 +18768,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace SulfurDioxideConcentrationMeasurement namespace DissolvedOxygenConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18927,14 +18815,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace DissolvedOxygenConcentrationMeasurement namespace BromateConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -18976,14 +18862,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace BromateConcentrationMeasurement namespace ChloraminesConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19025,14 +18909,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ChloraminesConcentrationMeasurement namespace ChlorineConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19074,14 +18956,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ChlorineConcentrationMeasurement namespace FecalColiformAndEColiConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19123,14 +19003,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace FecalColiformAndEColiConcentrationMeasurement namespace FluorideConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19172,14 +19050,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace FluorideConcentrationMeasurement namespace HaloaceticAcidsConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19221,14 +19097,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace HaloaceticAcidsConcentrationMeasurement namespace TotalTrihalomethanesConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19270,14 +19144,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace TotalTrihalomethanesConcentrationMeasurement namespace TotalColiformBacteriaConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19319,14 +19191,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace TotalColiformBacteriaConcentrationMeasurement namespace TurbidityConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19368,14 +19238,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace TurbidityConcentrationMeasurement namespace CopperConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19417,14 +19285,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace CopperConcentrationMeasurement namespace LeadConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19466,14 +19332,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace LeadConcentrationMeasurement namespace ManganeseConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19515,14 +19379,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ManganeseConcentrationMeasurement namespace SulfateConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19564,14 +19426,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace SulfateConcentrationMeasurement namespace BromodichloromethaneConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19613,14 +19473,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace BromodichloromethaneConcentrationMeasurement namespace BromoformConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19662,14 +19520,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace BromoformConcentrationMeasurement namespace ChlorodibromomethaneConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19711,14 +19567,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ChlorodibromomethaneConcentrationMeasurement namespace ChloroformConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19760,14 +19614,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ChloroformConcentrationMeasurement namespace SodiumConcentrationMeasurement { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -19809,8 +19661,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace SodiumConcentrationMeasurement namespace IasZone { @@ -20140,8 +19991,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace IasZone namespace IasAce { @@ -21060,8 +20910,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace IasAce namespace IasWd { @@ -21186,14 +21035,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace IasWd namespace WakeOnLan { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -21226,8 +21073,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace WakeOnLan namespace Channel { @@ -21538,8 +21384,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Channel namespace TargetNavigator { @@ -21709,8 +21554,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace TargetNavigator namespace MediaPlayback { @@ -22231,8 +22075,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace MediaPlayback namespace MediaInput { @@ -22472,8 +22315,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace MediaInput namespace LowPower { @@ -22542,8 +22384,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace LowPower namespace KeypadInput { @@ -22653,8 +22494,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace KeypadInput namespace ContentLauncher { @@ -23118,8 +22958,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ContentLauncher namespace AudioOutput { @@ -23289,8 +23128,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace AudioOutput namespace ApplicationLauncher { @@ -23578,8 +23416,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ApplicationLauncher namespace ApplicationBasic { @@ -23630,8 +23467,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace ApplicationBasicApplication } // namespace Structs -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -23685,8 +23521,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ApplicationBasic namespace AccountLogin { @@ -23872,8 +23707,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace AccountLogin namespace TestCluster { @@ -26554,14 +26388,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace Messaging namespace ApplianceIdentification { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -26627,14 +26459,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ApplianceIdentification namespace MeterIdentification { -namespace Commands { -} // namespace Commands +namespace Commands {} // namespace Commands namespace Attributes { CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) @@ -26700,8 +26530,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace MeterIdentification namespace ApplianceEventsAndAlert { @@ -26893,8 +26722,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ApplianceEventsAndAlert namespace ApplianceStatistics { @@ -27186,8 +27014,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ApplianceStatistics namespace ElectricalMeasurement { @@ -27795,8 +27622,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre } } // namespace Attributes -namespace Events { -} // namespace Events +namespace Events {} // namespace Events } // namespace ElectricalMeasurement diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h index 8a80051ae719ba..54f9aac83a49ea 100644 --- a/zzz_generated/bridge-app/zap-generated/endpoint_config.h +++ b/zzz_generated/bridge-app/zap-generated/endpoint_config.h @@ -85,7 +85,10 @@ /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* HourFormat */ \ \ - /* Endpoint: 1, Cluster: Level Control (server) */ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x3 } /* options */ \ + /* Endpoint: 1, Cluster: Level Control (server) */ \ + { \ + (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x3 \ + } /* options */ \ } #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask @@ -892,7 +895,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x000E, 1 }, { 0x0101, 1 } \ + { 0x000E, 1 }, \ + { \ + 0x0101, 1 \ + } \ } // Array of device type offsets diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index d8b83514c0d0a3..607e13897c05eb 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -21803,9 +21803,9 @@ class Test_TC_MF_1_3Suite : public TestCommand value.commissioningTimeout = 180U; value.PAKEVerifier = chip::ByteSpan( chip::Uint8::from_const_char("\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#" - "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" - "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" - "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), + "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" + "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" + "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), 97); value.discriminator = mDiscriminator.HasValue() ? mDiscriminator.Value() : 3840U; value.iterations = 1000UL; @@ -22274,9 +22274,9 @@ class Test_TC_MF_1_5Suite : public TestCommand value.commissioningTimeout = 180U; value.PAKEVerifier = chip::ByteSpan( chip::Uint8::from_const_char("\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#" - "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" - "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" - "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), + "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" + "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" + "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), 97); value.discriminator = 3840U; value.iterations = 1000UL; @@ -22330,9 +22330,9 @@ class Test_TC_MF_1_5Suite : public TestCommand value.commissioningTimeout = 180U; value.PAKEVerifier = chip::ByteSpan( chip::Uint8::from_const_char("\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#" - "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" - "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" - "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), + "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" + "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" + "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), 97); value.discriminator = 3840U; value.iterations = 1000UL; @@ -22391,9 +22391,9 @@ class Test_TC_MF_1_5Suite : public TestCommand value.commissioningTimeout = 180U; value.PAKEVerifier = chip::ByteSpan( chip::Uint8::from_const_char("\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#" - "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" - "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" - "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), + "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" + "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" + "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), 97); value.discriminator = 3840U; value.iterations = 1000UL; @@ -22974,9 +22974,9 @@ class Test_TC_MF_1_15Suite : public TestCommand value.commissioningTimeout = 180U; value.PAKEVerifier = chip::ByteSpan( chip::Uint8::from_const_char("\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#" - "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" - "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" - "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), + "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" + "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" + "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), 97); value.discriminator = 3840U; value.iterations = 1000UL; @@ -23027,9 +23027,9 @@ class Test_TC_MF_1_15Suite : public TestCommand value.commissioningTimeout = 180U; value.PAKEVerifier = chip::ByteSpan( chip::Uint8::from_const_char("\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#" - "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" - "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" - "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), + "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" + "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" + "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), 97); value.discriminator = 3840U; value.iterations = 1000UL; @@ -23047,9 +23047,9 @@ class Test_TC_MF_1_15Suite : public TestCommand value.commissioningTimeout = 180U; value.PAKEVerifier = chip::ByteSpan( chip::Uint8::from_const_char("\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#" - "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" - "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" - "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), + "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" + "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" + "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), 97); value.discriminator = 3840U; value.iterations = 1000UL; @@ -23100,9 +23100,9 @@ class Test_TC_MF_1_15Suite : public TestCommand value.commissioningTimeout = 180U; value.PAKEVerifier = chip::ByteSpan( chip::Uint8::from_const_char("\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#" - "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" - "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" - "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), + "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" + "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" + "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), 97); value.discriminator = 3840U; value.iterations = 1000UL; @@ -23120,9 +23120,9 @@ class Test_TC_MF_1_15Suite : public TestCommand value.commissioningTimeout = 180U; value.PAKEVerifier = chip::ByteSpan( chip::Uint8::from_const_char("\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#" - "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" - "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" - "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), + "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" + "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" + "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), 97); value.discriminator = 3840U; value.iterations = 1000UL; @@ -65562,8 +65562,7 @@ class Test_TC_DD_1_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -65618,8 +65617,7 @@ class Test_TC_DD_1_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -65674,8 +65672,7 @@ class Test_TC_DD_1_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -65730,8 +65727,7 @@ class Test_TC_DD_1_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -65786,8 +65782,7 @@ class Test_TC_DD_1_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -65842,8 +65837,7 @@ class Test_TC_DD_1_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -65898,8 +65892,7 @@ class Test_TC_DD_1_11Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -65954,8 +65947,7 @@ class Test_TC_DD_1_12Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66010,8 +66002,7 @@ class Test_TC_DD_1_13Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66066,8 +66057,7 @@ class Test_TC_DD_1_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66122,8 +66112,7 @@ class Test_TC_DD_1_15Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66178,8 +66167,7 @@ class Test_TC_DD_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66234,8 +66222,7 @@ class Test_TC_DD_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66290,8 +66277,7 @@ class Test_TC_DD_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66346,8 +66332,7 @@ class Test_TC_DD_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66402,8 +66387,7 @@ class Test_TC_DD_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66458,8 +66442,7 @@ class Test_TC_DD_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66514,8 +66497,7 @@ class Test_TC_DD_3_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66570,8 +66552,7 @@ class Test_TC_DD_3_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66626,8 +66607,7 @@ class Test_TC_DD_3_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66682,8 +66662,7 @@ class Test_TC_DD_3_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66738,8 +66717,7 @@ class Test_TC_DD_3_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66794,8 +66772,7 @@ class Test_TC_DD_3_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66850,8 +66827,7 @@ class Test_TC_DD_3_11Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66906,8 +66882,7 @@ class Test_TC_DD_3_12Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -66962,8 +66937,7 @@ class Test_TC_DD_3_13Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -67018,8 +66992,7 @@ class Test_TC_DD_3_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -67074,8 +67047,7 @@ class Test_TC_DD_3_15Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -67130,8 +67102,7 @@ class Test_TC_DD_3_16Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -67186,8 +67157,7 @@ class Test_TC_DD_3_17Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -67242,8 +67212,7 @@ class Test_TC_DD_3_18Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -67298,8 +67267,7 @@ class Test_TC_DD_3_19Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -67354,8 +67322,7 @@ class Test_TC_DD_3_20Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -67863,8 +67830,7 @@ class Test_TC_GR_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -67919,8 +67885,7 @@ class Test_TC_GR_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -67975,8 +67940,7 @@ class Test_TC_GR_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68031,8 +67995,7 @@ class Test_TC_GR_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68087,8 +68050,7 @@ class Test_TC_GR_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68143,8 +68105,7 @@ class Test_TC_BDX_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68199,8 +68160,7 @@ class Test_TC_BDX_1_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68255,8 +68215,7 @@ class Test_TC_BDX_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68311,8 +68270,7 @@ class Test_TC_BDX_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68367,8 +68325,7 @@ class Test_TC_BR_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68423,8 +68380,7 @@ class Test_TC_BR_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68479,8 +68435,7 @@ class Test_TC_BR_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68535,8 +68490,7 @@ class Test_TC_BRAC_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68591,8 +68545,7 @@ class Test_TC_BRAC_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68647,8 +68600,7 @@ class Test_TC_BRAC_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68703,8 +68655,7 @@ class Test_TC_DA_1_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68759,8 +68710,7 @@ class Test_TC_DM_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68815,8 +68765,7 @@ class Test_TC_DM_1_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -68871,8 +68820,7 @@ class Test_TC_DM_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69133,8 +69081,7 @@ class Test_TC_DM_2_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69189,8 +69136,7 @@ class Test_TC_DM_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69245,8 +69191,7 @@ class Test_TC_DM_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69301,8 +69246,7 @@ class Test_TC_DM_4_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69357,8 +69301,7 @@ class Test_TC_DM_4_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69413,8 +69356,7 @@ class Test_TC_DM_4_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69469,8 +69411,7 @@ class Test_TC_DM_4_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69525,8 +69466,7 @@ class Test_TC_DM_4_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69581,8 +69521,7 @@ class Test_TC_DM_4_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69637,8 +69576,7 @@ class Test_TC_DM_4_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69693,8 +69631,7 @@ class Test_TC_DM_4_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69749,8 +69686,7 @@ class Test_TC_DM_4_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69805,8 +69741,7 @@ class Test_TC_DM_4_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69861,8 +69796,7 @@ class Test_TC_DM_4_11Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69917,8 +69851,7 @@ class Test_TC_DM_4_12Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -69973,8 +69906,7 @@ class Test_TC_DM_4_13Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70029,8 +69961,7 @@ class Test_TC_DM_4_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70085,8 +70016,7 @@ class Test_TC_DM_4_15Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70141,8 +70071,7 @@ class Test_TC_DM_4_16Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70197,8 +70126,7 @@ class Test_TC_DM_4_17Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70253,8 +70181,7 @@ class Test_TC_DM_4_18Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70309,8 +70236,7 @@ class Test_TC_DM_4_19Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70365,8 +70291,7 @@ class Test_TC_DM_4_20Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70421,8 +70346,7 @@ class Test_TC_DM_4_21Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70478,8 +70402,7 @@ class Test_TC_DIAGLOG_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70535,8 +70458,7 @@ class Test_TC_DIAGLOG_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70592,8 +70514,7 @@ class Test_TC_DIAGLOG_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70649,8 +70570,7 @@ class Test_TC_DIAGLOG_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70705,8 +70625,7 @@ class Test_TC_DESC_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70761,8 +70680,7 @@ class Test_TC_DESC_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70817,8 +70735,7 @@ class Test_TC_DESC_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70874,8 +70791,7 @@ class Test_TC_ETHDIAG_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70930,8 +70846,7 @@ class Test_TC_GC_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -70986,8 +70901,7 @@ class Test_TC_GC_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71042,8 +70956,7 @@ class Test_TC_GC_2_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71099,8 +71012,7 @@ class Test_TC_GENDIAG_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71156,8 +71068,7 @@ class Test_TC_GENDIAG_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71213,8 +71124,7 @@ class Test_TC_GENDIAG_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71269,8 +71179,7 @@ class Test_TC_I_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71325,8 +71234,7 @@ class Test_TC_I_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71381,8 +71289,7 @@ class Test_TC_I_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71437,8 +71344,7 @@ class Test_TC_ILL_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71493,8 +71399,7 @@ class Test_TC_ILL_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71549,8 +71454,7 @@ class Test_TC_IDM_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71605,8 +71509,7 @@ class Test_TC_IDM_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71661,8 +71564,7 @@ class Test_TC_IDM_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71717,8 +71619,7 @@ class Test_TC_IDM_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71773,8 +71674,7 @@ class Test_TC_IDM_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71829,8 +71729,7 @@ class Test_TC_IDM_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71885,8 +71784,7 @@ class Test_TC_IDM_4_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71941,8 +71839,7 @@ class Test_TC_IDM_4_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -71997,8 +71894,7 @@ class Test_TC_IDM_5_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -72053,8 +71949,7 @@ class Test_TC_IDM_5_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -72109,8 +72004,7 @@ class Test_TC_IDM_6_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -72165,8 +72059,7 @@ class Test_TC_IDM_6_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -72221,8 +72114,7 @@ class Test_TC_IDM_6_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -72277,8 +72169,7 @@ class Test_TC_IDM_6_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -72333,8 +72224,7 @@ class Test_TC_IDM_7_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -72389,8 +72279,7 @@ class Test_TC_MC_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -72445,8 +72334,7 @@ class Test_TC_MC_4_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -73601,8 +73489,7 @@ class Test_TC_MC_8_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -73657,8 +73544,7 @@ class Test_TC_MC_9_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -73713,8 +73599,7 @@ class Test_TC_MC_10_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -73769,8 +73654,7 @@ class Test_TC_MC_10_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -73825,8 +73709,7 @@ class Test_TC_MC_10_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -73881,8 +73764,7 @@ class Test_TC_MC_10_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -73937,8 +73819,7 @@ class Test_TC_MC_10_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -73993,8 +73874,7 @@ class Test_TC_MC_10_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74049,8 +73929,7 @@ class Test_TC_MF_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74105,8 +73984,7 @@ class Test_TC_MF_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74161,8 +74039,7 @@ class Test_TC_MF_1_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74217,8 +74094,7 @@ class Test_TC_MF_1_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74273,8 +74149,7 @@ class Test_TC_MF_1_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74329,8 +74204,7 @@ class Test_TC_MF_1_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74385,8 +74259,7 @@ class Test_TC_MF_1_11Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74441,8 +74314,7 @@ class Test_TC_MF_1_12Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74497,8 +74369,7 @@ class Test_TC_MF_1_13Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74553,8 +74424,7 @@ class Test_TC_MF_1_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74609,8 +74479,7 @@ class Test_TC_MF_1_16Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74665,8 +74534,7 @@ class Test_TC_MF_1_17Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74721,8 +74589,7 @@ class Test_TC_MF_1_18Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74777,8 +74644,7 @@ class Test_TC_MF_1_19Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74833,8 +74699,7 @@ class Test_TC_MF_1_20Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74889,8 +74754,7 @@ class Test_TC_MF_1_21Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -74945,8 +74809,7 @@ class Test_TC_MF_1_22Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -75001,8 +74864,7 @@ class Test_TC_MF_1_23Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -75057,8 +74919,7 @@ class Test_TC_MF_1_24Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -75113,8 +74974,7 @@ class Test_TC_MF_1_25Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -75169,8 +75029,7 @@ class Test_TC_MF_1_26Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -75412,9 +75271,9 @@ class Test_TC_MF_1_28Suite : public TestCommand value.commissioningTimeout = 180U; value.PAKEVerifier = chip::ByteSpan( chip::Uint8::from_const_char("\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#" - "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" - "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" - "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), + "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" + "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" + "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), 97); value.discriminator = 3840U; value.iterations = 1000UL; @@ -75444,9 +75303,9 @@ class Test_TC_MF_1_28Suite : public TestCommand value.commissioningTimeout = 179U; value.PAKEVerifier = chip::ByteSpan( chip::Uint8::from_const_char("\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#" - "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" - "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" - "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), + "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" + "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357" + "\326\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), 97); value.discriminator = 3840U; value.iterations = 1000UL; @@ -75517,8 +75376,7 @@ class Test_TC_MOD_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -75573,8 +75431,7 @@ class Test_TC_MOD_1_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -75629,8 +75486,7 @@ class Test_TC_MOD_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -75685,8 +75541,7 @@ class Test_TC_MOD_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -75741,8 +75596,7 @@ class Test_TC_MOD_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -75797,8 +75651,7 @@ class Test_TC_MOD_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -75853,8 +75706,7 @@ class Test_TC_MOD_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -75909,8 +75761,7 @@ class Test_TC_SU_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -75965,8 +75816,7 @@ class Test_TC_SU_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76021,8 +75871,7 @@ class Test_TC_SU_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76077,8 +75926,7 @@ class Test_TC_SU_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76133,8 +75981,7 @@ class Test_TC_SU_2_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76189,8 +76036,7 @@ class Test_TC_SU_2_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76245,8 +76091,7 @@ class Test_TC_SU_2_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76301,8 +76146,7 @@ class Test_TC_SU_2_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76357,8 +76201,7 @@ class Test_TC_SU_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76413,8 +76256,7 @@ class Test_TC_SU_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76469,8 +76311,7 @@ class Test_TC_SU_3_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76525,8 +76366,7 @@ class Test_TC_SU_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76581,8 +76421,7 @@ class Test_TC_SU_4_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76637,8 +76476,7 @@ class Test_TC_SU_4_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76693,8 +76531,7 @@ class Test_TC_PSCFG_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76749,8 +76586,7 @@ class Test_TC_PSCFG_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76805,8 +76641,7 @@ class Test_TC_PSCFG_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76861,8 +76696,7 @@ class Test_TC_SC_4_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76917,8 +76751,7 @@ class Test_TC_SC_4_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -76973,8 +76806,7 @@ class Test_TC_SC_4_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -77029,8 +76861,7 @@ class Test_TC_SC_4_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -77085,8 +76916,7 @@ class Test_TC_SC_4_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -77141,8 +76971,7 @@ class Test_TC_SC_4_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -77197,8 +77026,7 @@ class Test_TC_SC_4_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -77253,8 +77081,7 @@ class Test_TC_SC_4_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -77309,8 +77136,7 @@ class Test_TC_SC_4_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -77365,8 +77191,7 @@ class Test_TC_SWDIAG_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -77422,8 +77247,7 @@ class Test_TC_WIFIDIAG_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -77479,8 +77303,7 @@ class Test_TC_WIFIDIAG_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -77535,8 +77358,7 @@ class Test_TC_WNCV_6_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -77591,8 +77413,7 @@ class Test_TC_WNCV_7_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -77757,8 +77578,7 @@ class Test_TC_FLW_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -77924,8 +77744,7 @@ class Test_TC_OCC_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -77980,8 +77799,7 @@ class Test_TC_OCC_2_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78036,8 +77854,7 @@ class Test_TC_OCC_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78092,8 +77909,7 @@ class Test_TC_OCC_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78148,8 +77964,7 @@ class Test_TC_PRS_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78204,8 +78019,7 @@ class Test_TC_PRS_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78260,8 +78074,7 @@ class Test_TC_PRS_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78316,8 +78129,7 @@ class Test_TC_PS_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78372,8 +78184,7 @@ class Test_TC_PS_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78428,8 +78239,7 @@ class Test_TC_BOOL_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78484,8 +78294,7 @@ class Test_TC_BOOL_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78540,8 +78349,7 @@ class Test_TC_CC_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78596,8 +78404,7 @@ class Test_TC_CC_3_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78652,8 +78459,7 @@ class Test_TC_CC_4_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78708,8 +78514,7 @@ class Test_TC_CC_5_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78764,8 +78569,7 @@ class Test_TC_CC_6_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78820,8 +78624,7 @@ class Test_TC_CC_7_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78876,8 +78679,7 @@ class Test_TC_CC_9_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78932,8 +78734,7 @@ class Test_TC_DL_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -78988,8 +78789,7 @@ class Test_TC_DL_2_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79044,8 +78844,7 @@ class Test_TC_DL_2_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79100,8 +78899,7 @@ class Test_TC_DL_2_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79156,8 +78954,7 @@ class Test_TC_DL_2_10Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79212,8 +79009,7 @@ class Test_TC_DL_2_13Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79268,8 +79064,7 @@ class Test_TC_DL_2_14Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79324,8 +79119,7 @@ class Test_TC_DL_2_15Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79380,8 +79174,7 @@ class Test_TC_DL_2_16Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79436,8 +79229,7 @@ class Test_TC_DL_2_17Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79492,8 +79284,7 @@ class Test_TC_LC_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79548,8 +79339,7 @@ class Test_TC_LC_2_4Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79604,8 +79394,7 @@ class Test_TC_LC_2_5Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79660,8 +79449,7 @@ class Test_TC_LO_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79716,8 +79504,7 @@ class Test_TC_LO_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79772,8 +79559,7 @@ class Test_TC_LO_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79828,8 +79614,7 @@ class Test_TC_LVL_2_3Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79884,8 +79669,7 @@ class Test_TC_OO_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -79940,8 +79724,7 @@ class Test_TC_OO_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -80141,8 +79924,7 @@ class Test_TC_RH_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -80197,8 +79979,7 @@ class Test_TC_SWTCH_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -80253,8 +80034,7 @@ class Test_TC_SWTCH_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -80309,8 +80089,7 @@ class Test_TC_SWTCH_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -80507,8 +80286,7 @@ class Test_TC_TM_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -80563,8 +80341,7 @@ class Test_TC_TSTAT_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -80619,8 +80396,7 @@ class Test_TC_TSTAT_3_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -80675,8 +80451,7 @@ class Test_TC_TSUIC_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -80732,8 +80507,7 @@ class Test_TC_DIAG_TH_NW_2_6Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -80789,8 +80563,7 @@ class Test_TC_DIAG_TH_NW_2_7Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -80846,8 +80619,7 @@ class Test_TC_DIAG_TH_NW_2_8Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -80903,8 +80675,7 @@ class Test_TC_DIAG_TH_NW_2_9Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -80959,8 +80730,7 @@ class Test_TC_ACT_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -81015,8 +80785,7 @@ class Test_TC_ACT_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -81071,8 +80840,7 @@ class Test_TC_ACT_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -81127,8 +80895,7 @@ class Test_TC_ACT_3_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -81183,8 +80950,7 @@ class Test_TC_TFL_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -81239,8 +81005,7 @@ class Test_TC_TFL_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -81295,8 +81060,7 @@ class Test_TC_TFL_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -81351,8 +81115,7 @@ class Test_TC_TFL_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -81407,8 +81170,7 @@ class Test_TC_UL_1_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -81463,8 +81225,7 @@ class Test_TC_UL_1_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -81519,8 +81280,7 @@ class Test_TC_UL_2_1Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; @@ -81575,8 +81335,7 @@ class Test_TC_UL_2_2Suite : public TestCommand { using namespace chip::app::Clusters; switch (testIndex) - { - } + {} return CHIP_NO_ERROR; } }; diff --git a/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp index dbcfc737576d37..5d2149739acdc4 100644 --- a/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp @@ -39,9 +39,7 @@ namespace app { // Cluster specific command parsing -namespace Clusters { - -} // namespace Clusters +namespace Clusters {} // namespace Clusters void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { diff --git a/zzz_generated/controller-clusters/zap-generated/endpoint_config.h b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h index f5d4d26b38a990..954def9cc13cfe 100644 --- a/zzz_generated/controller-clusters/zap-generated/endpoint_config.h +++ b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h @@ -27,13 +27,11 @@ // Separate block is generated for big-endian and little-endian cases. #if BIGENDIAN_CPU #define GENERATED_DEFAULTS \ - { \ - } + {} #else // !BIGENDIAN_CPU #define GENERATED_DEFAULTS \ - { \ - } + {} #endif // BIGENDIAN_CPU @@ -60,15 +58,13 @@ // This is an array of EmberAfAttributeMinMaxValue structures. #define GENERATED_MIN_MAX_DEFAULT_COUNT 0 #define GENERATED_MIN_MAX_DEFAULTS \ - { \ - } + {} #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. #define GENERATED_ATTRIBUTE_COUNT 0 #define GENERATED_ATTRIBUTES \ - { \ - } + {} // This is an array of EmberAfCluster structures. #define ZAP_ATTRIBUTE_INDEX(index) (&generatedAttributes[index]) diff --git a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h index 2f498a79b144e4..07c72bf863fc75 100644 --- a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h +++ b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h @@ -976,7 +976,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0103, 1 } \ + { 0x0016, 1 }, \ + { \ + 0x0103, 1 \ + } \ } // Array of device type offsets diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h index bef43ea5f3a57b..95197e8b832ba5 100644 --- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h @@ -1118,7 +1118,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0101, 1 } \ + { 0x0016, 1 }, \ + { \ + 0x0101, 1 \ + } \ } // Array of device type offsets diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h index f89c5f494cca40..dc4e861b921db5 100644 --- a/zzz_generated/lock-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h @@ -1068,7 +1068,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x000A, 1 } \ + { 0x0016, 1 }, \ + { \ + 0x000A, 1 \ + } \ } // Array of device type offsets diff --git a/zzz_generated/log-source-app/zap-generated/endpoint_config.h b/zzz_generated/log-source-app/zap-generated/endpoint_config.h index 0c6f671bd334bc..c9c9d23fc388be 100644 --- a/zzz_generated/log-source-app/zap-generated/endpoint_config.h +++ b/zzz_generated/log-source-app/zap-generated/endpoint_config.h @@ -70,8 +70,7 @@ // This is an array of EmberAfAttributeMinMaxValue structures. #define GENERATED_MIN_MAX_DEFAULT_COUNT 0 #define GENERATED_MIN_MAX_DEFAULTS \ - { \ - } + {} #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. @@ -297,8 +296,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ - { \ - } + {} // Array of device type offsets #define FIXED_DEVICE_TYPE_OFFSETS \ diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h index a693a88a76d4af..d7aae00e698f77 100644 --- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h @@ -1453,7 +1453,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0xFF00, 1 }, { 0x0102, 1 } \ + { 0xFF00, 1 }, \ + { \ + 0x0102, 1 \ + } \ } // Array of device type offsets diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h index a693a88a76d4af..d7aae00e698f77 100644 --- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h @@ -1453,7 +1453,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0xFF00, 1 }, { 0x0102, 1 } \ + { 0xFF00, 1 }, \ + { \ + 0x0102, 1 \ + } \ } // Array of device type offsets diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h index 0af0247b84e0ab..947d6c4d0411fb 100644 --- a/zzz_generated/pump-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h @@ -1125,7 +1125,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0303, 1 } \ + { 0x0016, 1 }, \ + { \ + 0x0303, 1 \ + } \ } // Array of device type offsets diff --git a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h index fca68d9283b3bd..3fd6d91d77f301 100644 --- a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h @@ -892,7 +892,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0304, 1 } \ + { 0x0016, 1 }, \ + { \ + 0x0304, 1 \ + } \ } // Array of device type offsets diff --git a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h index 9a03bf592d591a..a6e65c09b7e6ba 100644 --- a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h +++ b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h @@ -671,7 +671,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0302, 1 } \ + { 0x0016, 1 }, \ + { \ + 0x0302, 1 \ + } \ } // Array of device type offsets diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h index 508a92f82261fc..bb60898afbd61e 100644 --- a/zzz_generated/thermostat/zap-generated/endpoint_config.h +++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h @@ -1065,7 +1065,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0301, 1 } \ + { 0x0016, 1 }, \ + { \ + 0x0301, 1 \ + } \ } // Array of device type offsets diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h index 770e5b3831306e..42d4a00ee57fad 100644 --- a/zzz_generated/tv-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h @@ -141,7 +141,10 @@ /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* HourFormat */ \ \ - /* Endpoint: 2, Cluster: Level Control (server) */ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x3 } /* options */ \ + /* Endpoint: 2, Cluster: Level Control (server) */ \ + { \ + (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x3 \ + } /* options */ \ } #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask @@ -1558,7 +1561,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0023, 1 }, { 0x0022, 1 }, { 0x0024, 1 }, { 0x0024, 1 }, { 0x0024, 1 } \ + { 0x0016, 1 }, { 0x0023, 1 }, { 0x0022, 1 }, { 0x0024, 1 }, { 0x0024, 1 }, \ + { \ + 0x0024, 1 \ + } \ } // Array of device type offsets diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h index aeb51d1539b21a..90280f5f284003 100644 --- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h @@ -1419,7 +1419,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0023, 1 }, { 0x0107, 1 } \ + { 0x0016, 1 }, { 0x0023, 1 }, \ + { \ + 0x0107, 1 \ + } \ } // Array of device type offsets diff --git a/zzz_generated/window-app/zap-generated/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h index 1acf16c0d077f9..5ba8015289c429 100644 --- a/zzz_generated/window-app/zap-generated/endpoint_config.h +++ b/zzz_generated/window-app/zap-generated/endpoint_config.h @@ -88,7 +88,10 @@ /* Endpoint: 1, Cluster: Window Covering (server) */ \ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xF }, /* Mode */ \ \ - /* Endpoint: 2, Cluster: Window Covering (server) */ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xF } /* Mode */ \ + /* Endpoint: 2, Cluster: Window Covering (server) */ \ + { \ + (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xF \ + } /* Mode */ \ } #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask @@ -1098,7 +1101,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0202, 2 }, { 0x0202, 2 } \ + { 0x0016, 1 }, { 0x0202, 2 }, \ + { \ + 0x0202, 2 \ + } \ } // Array of device type offsets