From 356647822afb42c5b081ca1ec4b18bd67f4c3363 Mon Sep 17 00:00:00 2001 From: Martin Turon Date: Mon, 9 Jan 2023 13:30:38 -0800 Subject: [PATCH] [tlv] Cleanup TLV module naming (remove CHIP from filenames). (#24312) * [tlv] Cleanup TLV module naming (remove CHIP from file and API names). * [tlv] Revert obj-C API changes. --- .../payload/SetupPayloadGenerateCommand.cpp | 2 +- .../common/pigweed/rpc_services/Attributes.h | 6 +- .../tracing/decoder/TraceDecoderProtocols.cpp | 2 +- .../interaction_model/DecoderCustomLog.cpp | 2 +- .../OTAProviderExample.cpp | 2 +- .../CustomCSRResponseOperationalKeyStore.cpp | 2 +- .../DeviceAttestationSe05xCredsExample_v2.cpp | 10 +- examples/providers/DeviceInfoProviderImpl.cpp | 2 +- .../src/PersistenceManager.cpp | 2 +- src/app/AttributeAccessInterface.h | 2 +- src/app/AttributePathExpandIterator.cpp | 2 +- src/app/AttributePathExpandIterator.h | 2 +- src/app/BufferedReadCallback.cpp | 6 +- src/app/BufferedReadCallback.h | 2 +- src/app/CommandHandler.cpp | 4 +- src/app/CommandHandler.h | 4 +- src/app/CommandSender.h | 2 +- src/app/EventLoggingDelegate.h | 2 +- src/app/EventLoggingTypes.h | 2 +- src/app/EventManagement.cpp | 2 +- src/app/InteractionModelEngine.cpp | 2 +- src/app/MessageDef/ArrayBuilder.h | 2 +- src/app/MessageDef/AttributeDataIB.h | 2 +- src/app/MessageDef/AttributeDataIBs.h | 2 +- src/app/MessageDef/AttributePathIB.h | 2 +- src/app/MessageDef/AttributePathIBs.h | 2 +- src/app/MessageDef/AttributeReportIB.h | 2 +- src/app/MessageDef/AttributeReportIBs.h | 2 +- src/app/MessageDef/AttributeStatusIB.h | 2 +- src/app/MessageDef/AttributeStatusIBs.h | 2 +- src/app/MessageDef/Builder.h | 2 +- src/app/MessageDef/ClusterPathIB.h | 2 +- src/app/MessageDef/CommandDataIB.h | 2 +- src/app/MessageDef/CommandPathIB.h | 2 +- src/app/MessageDef/CommandStatusIB.h | 2 +- src/app/MessageDef/DataVersionFilterIB.h | 2 +- src/app/MessageDef/DataVersionFilterIBs.h | 2 +- src/app/MessageDef/EventDataIB.h | 2 +- src/app/MessageDef/EventFilterIB.h | 2 +- src/app/MessageDef/EventFilterIBs.h | 2 +- src/app/MessageDef/EventPathIB.h | 2 +- src/app/MessageDef/EventPathIBs.h | 2 +- src/app/MessageDef/EventReportIB.h | 2 +- src/app/MessageDef/EventReportIBs.h | 2 +- src/app/MessageDef/EventStatusIB.h | 2 +- src/app/MessageDef/InvokeRequestMessage.h | 2 +- src/app/MessageDef/InvokeRequests.h | 2 +- src/app/MessageDef/InvokeResponseIB.h | 2 +- src/app/MessageDef/InvokeResponseIBs.h | 2 +- src/app/MessageDef/InvokeResponseMessage.h | 2 +- src/app/MessageDef/ListBuilder.h | 2 +- src/app/MessageDef/MessageDefHelper.h | 2 +- src/app/MessageDef/Parser.h | 2 +- src/app/MessageDef/ReadRequestMessage.h | 2 +- src/app/MessageDef/ReportDataMessage.h | 2 +- src/app/MessageDef/StatusIB.h | 2 +- src/app/MessageDef/StatusResponseMessage.h | 2 +- src/app/MessageDef/StructBuilder.h | 2 +- src/app/MessageDef/SubscribeRequestMessage.h | 2 +- src/app/MessageDef/SubscribeResponseMessage.h | 2 +- src/app/MessageDef/TimedRequestMessage.h | 2 +- src/app/MessageDef/WriteRequestMessage.h | 2 +- src/app/MessageDef/WriteResponseMessage.h | 2 +- src/app/ReadClient.cpp | 2 +- src/app/ReadClient.h | 2 +- src/app/ReadHandler.cpp | 2 +- src/app/ReadHandler.h | 2 +- src/app/ReadPrepareParams.h | 2 +- src/app/TimedHandler.cpp | 2 +- src/app/WriteClient.h | 2 +- src/app/WriteHandler.h | 2 +- .../DefaultOTARequestorStorage.cpp | 2 +- .../test-cluster-server.cpp | 2 +- .../thread-network-diagnostics-server.cpp | 2 +- src/app/data-model/DecodableList.h | 2 +- src/app/data-model/Decode.h | 2 +- src/app/data-model/Encode.h | 2 +- src/app/data-model/List.h | 2 +- src/app/data-model/TagBoundEncoder.h | 2 +- src/app/tests/TestAclAttribute.cpp | 6 +- src/app/tests/TestAclEvent.cpp | 6 +- .../tests/TestAttributePathExpandIterator.cpp | 2 +- src/app/tests/TestBufferedReadCallback.cpp | 2 +- src/app/tests/TestClusterStateCache.cpp | 2 +- src/app/tests/TestCommandInteraction.cpp | 6 +- src/app/tests/TestDataModelSerialization.cpp | 2 +- src/app/tests/TestEventLogging.cpp | 6 +- src/app/tests/TestEventOverflow.cpp | 6 +- .../tests/TestFabricScopedEventLogging.cpp | 6 +- src/app/tests/TestInteractionModelEngine.cpp | 6 +- src/app/tests/TestMessageDef.cpp | 2 +- src/app/tests/TestReadInteraction.cpp | 6 +- src/app/tests/TestReportingEngine.cpp | 6 +- src/app/tests/TestTimedHandler.cpp | 2 +- src/app/tests/TestWriteInteraction.cpp | 6 +- src/app/tests/integration/common.cpp | 2 +- .../util/attribute-storage-null-handling.h | 2 +- src/app/util/binding-table.h | 2 +- .../util/ember-compatibility-functions.cpp | 2 +- src/app/util/mock/Constants.h | 2 +- src/app/util/mock/attribute-storage.cpp | 2 +- src/controller/CHIPDeviceController.h | 2 +- .../ExampleOperationalCredentialsIssuer.cpp | 2 +- .../java/AndroidDeviceControllerWrapper.cpp | 2 +- .../AndroidOperationalCredentialsIssuer.cpp | 2 +- .../java/CHIPAttributeTLVValueDecoder.h | 2 +- .../java/CHIPEventTLVValueDecoder.h | 2 +- .../python/ChipDeviceController-Discovery.cpp | 2 +- .../ChipDeviceController-ScriptBinding.cpp | 2 +- .../tests/data_model/TestCommands.cpp | 4 +- src/credentials/CHIPCert.cpp | 2 +- src/credentials/CHIPCert.h | 2 +- src/credentials/CHIPCertFromX509.cpp | 2 +- src/credentials/CHIPCertToX509.cpp | 2 +- src/credentials/CertificationDeclaration.cpp | 2 +- src/credentials/CertificationDeclaration.h | 2 +- .../DeviceAttestationConstructor.cpp | 2 +- .../DeviceAttestationVendorReserved.h | 2 +- src/credentials/FabricTable.h | 2 +- src/credentials/GroupDataProviderImpl.cpp | 2 +- src/credentials/LastKnownGoodTime.h | 2 +- .../PersistentStorageOpCertStore.cpp | 2 +- src/credentials/tests/TestChipCert.cpp | 2 +- .../TestDeviceAttestationConstruction.cpp | 2 +- .../tests/TestGroupDataProvider.cpp | 2 +- .../PersistentStorageOperationalKeystore.cpp | 2 +- src/crypto/tests/CHIPCryptoPALTest.cpp | 2 +- .../MTRAttributeTLVValueDecoder_Internal.h | 2 +- .../Framework/CHIP/MTRBaseClusterUtils.h | 2 +- .../CHIP/MTRBaseSubscriptionCallback.h | 2 +- .../CHIP/MTREventTLVValueDecoder_Internal.h | 2 +- src/darwin/Framework/CHIP/MTRIMDispatch.mm | 2 +- .../CHIP/MTROperationalCredentialsDelegate.mm | 2 +- src/lib/asn1/ASN1Writer.cpp | 2 +- src/lib/asn1/tests/TestASN1.cpp | 2 +- src/lib/core/BUILD.gn | 16 +-- src/lib/core/CHIPCircularTLVBuffer.cpp | 2 +- src/lib/core/CHIPCircularTLVBuffer.h | 6 +- src/lib/core/OTAImageHeader.cpp | 2 +- src/lib/core/{CHIPTLV.h => TLV.h} | 8 +- src/lib/core/{CHIPTLVData.hpp => TLVData.h} | 2 +- .../core/{CHIPTLVDebug.cpp => TLVDebug.cpp} | 6 +- src/lib/core/{CHIPTLVDebug.hpp => TLVDebug.h} | 7 +- .../core/{CHIPTLVReader.cpp => TLVReader.cpp} | 2 +- src/lib/core/{CHIPTLVTags.h => TLVTags.h} | 0 src/lib/core/{CHIPTLVTypes.h => TLVTypes.h} | 0 .../{CHIPTLVUpdater.cpp => TLVUpdater.cpp} | 2 +- ...{CHIPTLVUtilities.cpp => TLVUtilities.cpp} | 4 +- .../{CHIPTLVUtilities.hpp => TLVUtilities.h} | 7 +- .../core/{CHIPTLVWriter.cpp => TLVWriter.cpp} | 12 +- src/lib/core/tests/BUILD.gn | 2 +- src/lib/core/tests/FuzzTlvReader.cpp | 4 +- .../tests/{TestCHIPTLV.cpp => TestTLV.cpp} | 120 +++++++++--------- src/lib/support/PersistentData.h | 2 +- src/lib/support/jsontlv/TlvJson.h | 2 +- .../ESP32/ESP32DeviceInfoProvider.cpp | 2 +- .../k32w/k32w0/K32W0FactoryDataProvider.cpp | 2 +- .../nxp/mw320/DeviceInfoProviderImpl.cpp | 2 +- .../nxp/mw320/FactoryDataProvider.cpp | 2 +- .../mw320/NetworkProvisioningServerImpl.cpp | 2 +- .../EFR32/Efr32PsaOperationalKeystore.cpp | 2 +- .../bdx/tests/TestBdxTransferSession.cpp | 8 +- src/protocols/secure_channel/CASESession.h | 2 +- .../secure_channel/PairingSession.cpp | 2 +- src/protocols/secure_channel/PairingSession.h | 2 +- .../SimpleSessionResumptionStorage.h | 2 +- .../AdditionalDataPayloadGenerator.cpp | 2 +- .../AdditionalDataPayloadParser.cpp | 4 +- .../QRCodeSetupPayloadGenerator.cpp | 8 +- .../QRCodeSetupPayloadParser.cpp | 4 +- src/setup_payload/QRCodeSetupPayloadParser.h | 2 +- src/setup_payload/SetupPayload.cpp | 6 +- src/system/SystemPacketBuffer.h | 4 +- src/system/TLVPacketBufferBackingStore.h | 2 +- src/tools/chip-cert/CertUtils.cpp | 7 +- src/tools/chip-cert/Cmd_GenCert.cpp | 4 +- src/tools/chip-cert/Cmd_PrintCD.cpp | 2 +- src/tools/chip-cert/chip-cert.h | 8 +- 178 files changed, 306 insertions(+), 313 deletions(-) rename src/lib/core/{CHIPTLV.h => TLV.h} (99%) rename src/lib/core/{CHIPTLVData.hpp => TLVData.h} (99%) rename src/lib/core/{CHIPTLVDebug.cpp => TLVDebug.cpp} (98%) rename src/lib/core/{CHIPTLVDebug.hpp => TLVDebug.h} (93%) rename src/lib/core/{CHIPTLVReader.cpp => TLVReader.cpp} (99%) rename src/lib/core/{CHIPTLVTags.h => TLVTags.h} (100%) rename src/lib/core/{CHIPTLVTypes.h => TLVTypes.h} (100%) rename src/lib/core/{CHIPTLVUpdater.cpp => TLVUpdater.cpp} (99%) rename src/lib/core/{CHIPTLVUtilities.cpp => TLVUtilities.cpp} (99%) rename src/lib/core/{CHIPTLVUtilities.hpp => TLVUtilities.h} (94%) rename src/lib/core/{CHIPTLVWriter.cpp => TLVWriter.cpp} (98%) rename src/lib/core/tests/{TestCHIPTLV.cpp => TestTLV.cpp} (97%) diff --git a/examples/chip-tool/commands/payload/SetupPayloadGenerateCommand.cpp b/examples/chip-tool/commands/payload/SetupPayloadGenerateCommand.cpp index b873c15fe707cb..093a83f4620bbd 100644 --- a/examples/chip-tool/commands/payload/SetupPayloadGenerateCommand.cpp +++ b/examples/chip-tool/commands/payload/SetupPayloadGenerateCommand.cpp @@ -17,7 +17,7 @@ */ #include "SetupPayloadGenerateCommand.h" -#include +#include #include #include #include diff --git a/examples/common/pigweed/rpc_services/Attributes.h b/examples/common/pigweed/rpc_services/Attributes.h index abc9dd1268b6fa..ba3453df43ed86 100644 --- a/examples/common/pigweed/rpc_services/Attributes.h +++ b/examples/common/pigweed/rpc_services/Attributes.h @@ -25,9 +25,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include namespace chip { diff --git a/examples/common/tracing/decoder/TraceDecoderProtocols.cpp b/examples/common/tracing/decoder/TraceDecoderProtocols.cpp index 18da44d7578181..d50ccd77147b8f 100644 --- a/examples/common/tracing/decoder/TraceDecoderProtocols.cpp +++ b/examples/common/tracing/decoder/TraceDecoderProtocols.cpp @@ -24,7 +24,7 @@ #include "secure_channel/Decoder.h" #include "udc/Decoder.h" -#include +#include #include #include diff --git a/examples/common/tracing/decoder/interaction_model/DecoderCustomLog.cpp b/examples/common/tracing/decoder/interaction_model/DecoderCustomLog.cpp index c2f73187cac3ff..47a0b850955da2 100644 --- a/examples/common/tracing/decoder/interaction_model/DecoderCustomLog.cpp +++ b/examples/common/tracing/decoder/interaction_model/DecoderCustomLog.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include namespace { diff --git a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp index e7715a9fb9357a..234ee940b6d9db 100644 --- a/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp +++ b/examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/examples/platform/linux/testing/CustomCSRResponseOperationalKeyStore.cpp b/examples/platform/linux/testing/CustomCSRResponseOperationalKeyStore.cpp index 0ff63a70ef24eb..dfd063e866f9ea 100644 --- a/examples/platform/linux/testing/CustomCSRResponseOperationalKeyStore.cpp +++ b/examples/platform/linux/testing/CustomCSRResponseOperationalKeyStore.cpp @@ -19,7 +19,7 @@ #include "CustomCSRResponseOperationalKeyStore.h" #include -#include +#include #include namespace chip { diff --git a/examples/platform/nxp/se05x/DeviceAttestationSe05xCredsExample_v2.cpp b/examples/platform/nxp/se05x/DeviceAttestationSe05xCredsExample_v2.cpp index eb3b5e52553180..08cab351f771aa 100644 --- a/examples/platform/nxp/se05x/DeviceAttestationSe05xCredsExample_v2.cpp +++ b/examples/platform/nxp/se05x/DeviceAttestationSe05xCredsExample_v2.cpp @@ -20,10 +20,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #if CHIP_CRYPTO_HSM @@ -279,4 +279,4 @@ DeviceAttestationCredentialsProvider * GetExampleSe05xDACProviderv2() } // namespace Credentials } // namespace chip -#endif //#ifdef ENABLE_HSM_DEVICE_ATTESTATION +#endif // #ifdef ENABLE_HSM_DEVICE_ATTESTATION diff --git a/examples/providers/DeviceInfoProviderImpl.cpp b/examples/providers/DeviceInfoProviderImpl.cpp index d8c262647768ff..0e731492a91ba2 100644 --- a/examples/providers/DeviceInfoProviderImpl.cpp +++ b/examples/providers/DeviceInfoProviderImpl.cpp @@ -16,7 +16,7 @@ */ #include -#include +#include #include #include #include diff --git a/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp b/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp index a57415d68c7582..1e92e6eb4e2e13 100644 --- a/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp +++ b/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp @@ -18,7 +18,7 @@ #include "PersistenceManager.h" -#include +#include #include using namespace chip; diff --git a/src/app/AttributeAccessInterface.h b/src/app/AttributeAccessInterface.h index 37e90c90159ba1..5986bb7de6463a 100644 --- a/src/app/AttributeAccessInterface.h +++ b/src/app/AttributeAccessInterface.h @@ -28,8 +28,8 @@ #include // So we can encode lists #include #include -#include #include +#include #include /** diff --git a/src/app/AttributePathExpandIterator.cpp b/src/app/AttributePathExpandIterator.cpp index cfa84dd7e30be9..4e1275686689b4 100644 --- a/src/app/AttributePathExpandIterator.cpp +++ b/src/app/AttributePathExpandIterator.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/AttributePathExpandIterator.h b/src/app/AttributePathExpandIterator.h index df93ff35c2e09d..dbf8382014ce9c 100644 --- a/src/app/AttributePathExpandIterator.h +++ b/src/app/AttributePathExpandIterator.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/BufferedReadCallback.cpp b/src/app/BufferedReadCallback.cpp index 8f2b147a6159af..0279eff5eeab73 100644 --- a/src/app/BufferedReadCallback.cpp +++ b/src/app/BufferedReadCallback.cpp @@ -16,9 +16,9 @@ * limitations under the License. */ -#include "lib/core/CHIPTLV.h" -#include "lib/core/CHIPTLVTags.h" -#include "lib/core/CHIPTLVTypes.h" +#include "lib/core/TLV.h" +#include "lib/core/TLVTags.h" +#include "lib/core/TLVTypes.h" #include "protocols/interaction_model/Constants.h" #include "system/SystemPacketBuffer.h" #include "system/TLVPacketBufferBackingStore.h" diff --git a/src/app/BufferedReadCallback.h b/src/app/BufferedReadCallback.h index 0bee4d3552764d..747855be1d6ea7 100644 --- a/src/app/BufferedReadCallback.h +++ b/src/app/BufferedReadCallback.h @@ -18,7 +18,7 @@ #pragma once -#include "lib/core/CHIPTLV.h" +#include "lib/core/TLV.h" #include "system/SystemPacketBuffer.h" #include "system/TLVPacketBufferBackingStore.h" #include diff --git a/src/app/CommandHandler.cpp b/src/app/CommandHandler.cpp index 2cf45b9171fde6..4f7c1301e61394 100644 --- a/src/app/CommandHandler.cpp +++ b/src/app/CommandHandler.cpp @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/app/CommandHandler.h b/src/app/CommandHandler.h index bb96fe486f9f44..784abf8b41b50d 100644 --- a/src/app/CommandHandler.h +++ b/src/app/CommandHandler.h @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/app/CommandSender.h b/src/app/CommandSender.h index ab02fe9529517c..a2b232db70744b 100644 --- a/src/app/CommandSender.h +++ b/src/app/CommandSender.h @@ -32,8 +32,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/app/EventLoggingDelegate.h b/src/app/EventLoggingDelegate.h index 3c4fc3e6804edd..7cb1fd46eb85e7 100644 --- a/src/app/EventLoggingDelegate.h +++ b/src/app/EventLoggingDelegate.h @@ -24,7 +24,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/app/EventLoggingTypes.h b/src/app/EventLoggingTypes.h index c4fa7ca22f8400..58aa8edbfaaef4 100644 --- a/src/app/EventLoggingTypes.h +++ b/src/app/EventLoggingTypes.h @@ -22,8 +22,8 @@ #include #include #include -#include #include +#include #include constexpr size_t kNumPriorityLevel = 3; diff --git a/src/app/EventManagement.cpp b/src/app/EventManagement.cpp index f3d84481d884c9..81383405dbe2d9 100644 --- a/src/app/EventManagement.cpp +++ b/src/app/EventManagement.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp index 1f1c8aaf039460..bba9cd763c27da 100644 --- a/src/app/InteractionModelEngine.cpp +++ b/src/app/InteractionModelEngine.cpp @@ -30,7 +30,7 @@ #include "access/RequestPath.h" #include "access/SubjectDescriptor.h" #include -#include +#include #include extern bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId); diff --git a/src/app/MessageDef/ArrayBuilder.h b/src/app/MessageDef/ArrayBuilder.h index b8a0a91341a9c4..cd840af61adfdd 100644 --- a/src/app/MessageDef/ArrayBuilder.h +++ b/src/app/MessageDef/ArrayBuilder.h @@ -21,7 +21,7 @@ #include "Parser.h" #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/AttributeDataIB.h b/src/app/MessageDef/AttributeDataIB.h index 06ef728a3e5805..6f019c9965b55b 100644 --- a/src/app/MessageDef/AttributeDataIB.h +++ b/src/app/MessageDef/AttributeDataIB.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/AttributeDataIBs.h b/src/app/MessageDef/AttributeDataIBs.h index 3f6a2dda517743..e444eefc1b6b7f 100644 --- a/src/app/MessageDef/AttributeDataIBs.h +++ b/src/app/MessageDef/AttributeDataIBs.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/AttributePathIB.h b/src/app/MessageDef/AttributePathIB.h index d9c322eeae2ebe..0f7fb623ae44ea 100644 --- a/src/app/MessageDef/AttributePathIB.h +++ b/src/app/MessageDef/AttributePathIB.h @@ -27,8 +27,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/app/MessageDef/AttributePathIBs.h b/src/app/MessageDef/AttributePathIBs.h index e556be93de8d8b..8026e2783bc76c 100644 --- a/src/app/MessageDef/AttributePathIBs.h +++ b/src/app/MessageDef/AttributePathIBs.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/AttributeReportIB.h b/src/app/MessageDef/AttributeReportIB.h index 62f6a2d2e52a93..857ba3297a86f0 100644 --- a/src/app/MessageDef/AttributeReportIB.h +++ b/src/app/MessageDef/AttributeReportIB.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/AttributeReportIBs.h b/src/app/MessageDef/AttributeReportIBs.h index ddcf3e05a97ccf..cf0846ae209e8c 100644 --- a/src/app/MessageDef/AttributeReportIBs.h +++ b/src/app/MessageDef/AttributeReportIBs.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/AttributeStatusIB.h b/src/app/MessageDef/AttributeStatusIB.h index d75497a25a5da6..85c4dfbb6c2414 100644 --- a/src/app/MessageDef/AttributeStatusIB.h +++ b/src/app/MessageDef/AttributeStatusIB.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/AttributeStatusIBs.h b/src/app/MessageDef/AttributeStatusIBs.h index bfed79945a4728..bed5a23ab32589 100644 --- a/src/app/MessageDef/AttributeStatusIBs.h +++ b/src/app/MessageDef/AttributeStatusIBs.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/Builder.h b/src/app/MessageDef/Builder.h index 4b0ae96b203c25..5585bb8deadb62 100644 --- a/src/app/MessageDef/Builder.h +++ b/src/app/MessageDef/Builder.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/ClusterPathIB.h b/src/app/MessageDef/ClusterPathIB.h index 79a4f617ac3c7f..e58d27f2d800a4 100644 --- a/src/app/MessageDef/ClusterPathIB.h +++ b/src/app/MessageDef/ClusterPathIB.h @@ -23,8 +23,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/app/MessageDef/CommandDataIB.h b/src/app/MessageDef/CommandDataIB.h index 02e436e19aea2c..d7b0adf411118d 100644 --- a/src/app/MessageDef/CommandDataIB.h +++ b/src/app/MessageDef/CommandDataIB.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/CommandPathIB.h b/src/app/MessageDef/CommandPathIB.h index d95068a5794d3a..af2a80f71fd48b 100644 --- a/src/app/MessageDef/CommandPathIB.h +++ b/src/app/MessageDef/CommandPathIB.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/CommandStatusIB.h b/src/app/MessageDef/CommandStatusIB.h index bb4f8dc72ca65a..68150b994fe0b2 100644 --- a/src/app/MessageDef/CommandStatusIB.h +++ b/src/app/MessageDef/CommandStatusIB.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/DataVersionFilterIB.h b/src/app/MessageDef/DataVersionFilterIB.h index da15447375d97f..c4f2864b74ee71 100644 --- a/src/app/MessageDef/DataVersionFilterIB.h +++ b/src/app/MessageDef/DataVersionFilterIB.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/DataVersionFilterIBs.h b/src/app/MessageDef/DataVersionFilterIBs.h index 30ae8400173c5b..adc55d2e50af48 100644 --- a/src/app/MessageDef/DataVersionFilterIBs.h +++ b/src/app/MessageDef/DataVersionFilterIBs.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/EventDataIB.h b/src/app/MessageDef/EventDataIB.h index 4f28914af7de0f..d43505b1b0886e 100644 --- a/src/app/MessageDef/EventDataIB.h +++ b/src/app/MessageDef/EventDataIB.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/EventFilterIB.h b/src/app/MessageDef/EventFilterIB.h index ecf66cc92dbf60..b103d507398184 100644 --- a/src/app/MessageDef/EventFilterIB.h +++ b/src/app/MessageDef/EventFilterIB.h @@ -28,8 +28,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/app/MessageDef/EventFilterIBs.h b/src/app/MessageDef/EventFilterIBs.h index fd0b3e93add4a1..d48576f5a55f01 100644 --- a/src/app/MessageDef/EventFilterIBs.h +++ b/src/app/MessageDef/EventFilterIBs.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/EventPathIB.h b/src/app/MessageDef/EventPathIB.h index 34c60a2b8dbb28..0df812f012bbff 100644 --- a/src/app/MessageDef/EventPathIB.h +++ b/src/app/MessageDef/EventPathIB.h @@ -26,8 +26,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/app/MessageDef/EventPathIBs.h b/src/app/MessageDef/EventPathIBs.h index 7c7913eca52063..0f4a4612298fd4 100644 --- a/src/app/MessageDef/EventPathIBs.h +++ b/src/app/MessageDef/EventPathIBs.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/EventReportIB.h b/src/app/MessageDef/EventReportIB.h index 21d04267e76f79..e91ec6f1c3a6c6 100644 --- a/src/app/MessageDef/EventReportIB.h +++ b/src/app/MessageDef/EventReportIB.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/EventReportIBs.h b/src/app/MessageDef/EventReportIBs.h index bf9149ec2dd5ef..eacad665f08fc1 100644 --- a/src/app/MessageDef/EventReportIBs.h +++ b/src/app/MessageDef/EventReportIBs.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/EventStatusIB.h b/src/app/MessageDef/EventStatusIB.h index efe3d513c9c922..d7a44044fa39c7 100644 --- a/src/app/MessageDef/EventStatusIB.h +++ b/src/app/MessageDef/EventStatusIB.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/InvokeRequestMessage.h b/src/app/MessageDef/InvokeRequestMessage.h index 85b7483b8dfbf0..82d11fddcc592d 100644 --- a/src/app/MessageDef/InvokeRequestMessage.h +++ b/src/app/MessageDef/InvokeRequestMessage.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/InvokeRequests.h b/src/app/MessageDef/InvokeRequests.h index ed80465400d3d0..319d681000c431 100644 --- a/src/app/MessageDef/InvokeRequests.h +++ b/src/app/MessageDef/InvokeRequests.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/InvokeResponseIB.h b/src/app/MessageDef/InvokeResponseIB.h index a40b810707e939..3df6c190e9288b 100644 --- a/src/app/MessageDef/InvokeResponseIB.h +++ b/src/app/MessageDef/InvokeResponseIB.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/InvokeResponseIBs.h b/src/app/MessageDef/InvokeResponseIBs.h index 7830d7fbc803f8..8fc36a40f510ad 100644 --- a/src/app/MessageDef/InvokeResponseIBs.h +++ b/src/app/MessageDef/InvokeResponseIBs.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/InvokeResponseMessage.h b/src/app/MessageDef/InvokeResponseMessage.h index 989a5dca714c3d..3e916354d8b910 100644 --- a/src/app/MessageDef/InvokeResponseMessage.h +++ b/src/app/MessageDef/InvokeResponseMessage.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/ListBuilder.h b/src/app/MessageDef/ListBuilder.h index 56ce2dc4d27701..055be4ed3cf4b9 100644 --- a/src/app/MessageDef/ListBuilder.h +++ b/src/app/MessageDef/ListBuilder.h @@ -22,7 +22,7 @@ #include "Parser.h" #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/MessageDefHelper.h b/src/app/MessageDef/MessageDefHelper.h index 15763c69314cd7..b19b41ce9c8eaf 100644 --- a/src/app/MessageDef/MessageDefHelper.h +++ b/src/app/MessageDef/MessageDefHelper.h @@ -34,7 +34,7 @@ #include #include -#include +#include namespace chip { namespace app { diff --git a/src/app/MessageDef/Parser.h b/src/app/MessageDef/Parser.h index 83916062f61196..4b8f27e39eb867 100644 --- a/src/app/MessageDef/Parser.h +++ b/src/app/MessageDef/Parser.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/ReadRequestMessage.h b/src/app/MessageDef/ReadRequestMessage.h index 27736e9842bd08..f35fd96ad3da92 100644 --- a/src/app/MessageDef/ReadRequestMessage.h +++ b/src/app/MessageDef/ReadRequestMessage.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/ReportDataMessage.h b/src/app/MessageDef/ReportDataMessage.h index bd970a133c58d0..2250986ecbe4b1 100644 --- a/src/app/MessageDef/ReportDataMessage.h +++ b/src/app/MessageDef/ReportDataMessage.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/StatusIB.h b/src/app/MessageDef/StatusIB.h index 00ae724f3d2d4c..6e7a88229f415b 100644 --- a/src/app/MessageDef/StatusIB.h +++ b/src/app/MessageDef/StatusIB.h @@ -29,8 +29,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/app/MessageDef/StatusResponseMessage.h b/src/app/MessageDef/StatusResponseMessage.h index 5266af4514e9ed..c4e753eede0781 100644 --- a/src/app/MessageDef/StatusResponseMessage.h +++ b/src/app/MessageDef/StatusResponseMessage.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/MessageDef/StructBuilder.h b/src/app/MessageDef/StructBuilder.h index 4d0bea948f5e79..f6b2dc0696a8e9 100644 --- a/src/app/MessageDef/StructBuilder.h +++ b/src/app/MessageDef/StructBuilder.h @@ -21,7 +21,7 @@ #include "Parser.h" #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/SubscribeRequestMessage.h b/src/app/MessageDef/SubscribeRequestMessage.h index 7883e4af5a11b3..efe300e5ae6083 100644 --- a/src/app/MessageDef/SubscribeRequestMessage.h +++ b/src/app/MessageDef/SubscribeRequestMessage.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/SubscribeResponseMessage.h b/src/app/MessageDef/SubscribeResponseMessage.h index 614d926a0c386b..b7651a7af38fb2 100644 --- a/src/app/MessageDef/SubscribeResponseMessage.h +++ b/src/app/MessageDef/SubscribeResponseMessage.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/TimedRequestMessage.h b/src/app/MessageDef/TimedRequestMessage.h index eb27597ba5e276..4a1d13f670e5f9 100644 --- a/src/app/MessageDef/TimedRequestMessage.h +++ b/src/app/MessageDef/TimedRequestMessage.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/WriteRequestMessage.h b/src/app/MessageDef/WriteRequestMessage.h index 1eb8e3c7d4c76c..d083efbeca5f9e 100644 --- a/src/app/MessageDef/WriteRequestMessage.h +++ b/src/app/MessageDef/WriteRequestMessage.h @@ -27,7 +27,7 @@ #include "MessageParser.h" #include #include -#include +#include #include #include diff --git a/src/app/MessageDef/WriteResponseMessage.h b/src/app/MessageDef/WriteResponseMessage.h index b4d75d09b73a49..e57551e3c0c23b 100644 --- a/src/app/MessageDef/WriteResponseMessage.h +++ b/src/app/MessageDef/WriteResponseMessage.h @@ -22,7 +22,7 @@ #include "MessageParser.h" #include #include -#include +#include #include #include diff --git a/src/app/ReadClient.cpp b/src/app/ReadClient.cpp index 971df45f86fb53..aa96e5f1a1f2a9 100644 --- a/src/app/ReadClient.cpp +++ b/src/app/ReadClient.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/ReadClient.h b/src/app/ReadClient.h index 4ea66c89870302..cca70472a17cad 100644 --- a/src/app/ReadClient.h +++ b/src/app/ReadClient.h @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/ReadHandler.cpp b/src/app/ReadHandler.cpp index 75c76cbaba08ae..14b79dda3066a9 100644 --- a/src/app/ReadHandler.cpp +++ b/src/app/ReadHandler.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/app/ReadHandler.h b/src/app/ReadHandler.h index 06e8ed5c9a23b4..1e4f55066e9f3b 100644 --- a/src/app/ReadHandler.h +++ b/src/app/ReadHandler.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/ReadPrepareParams.h b/src/app/ReadPrepareParams.h index c37a2ef6e36eab..4f1958d50db190 100644 --- a/src/app/ReadPrepareParams.h +++ b/src/app/ReadPrepareParams.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include namespace chip { diff --git a/src/app/TimedHandler.cpp b/src/app/TimedHandler.cpp index 22a9718a3c6114..d448784721ac59 100644 --- a/src/app/TimedHandler.cpp +++ b/src/app/TimedHandler.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/WriteClient.h b/src/app/WriteClient.h index 3afe6ff9179ff6..b7599300ba52ee 100644 --- a/src/app/WriteClient.h +++ b/src/app/WriteClient.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/WriteHandler.h b/src/app/WriteHandler.h index a1b8831165437a..577a991d923bfb 100644 --- a/src/app/WriteHandler.h +++ b/src/app/WriteHandler.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/clusters/ota-requestor/DefaultOTARequestorStorage.cpp b/src/app/clusters/ota-requestor/DefaultOTARequestorStorage.cpp index bf8fa830fd8275..2258c7af309784 100644 --- a/src/app/clusters/ota-requestor/DefaultOTARequestorStorage.cpp +++ b/src/app/clusters/ota-requestor/DefaultOTARequestorStorage.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/src/app/clusters/test-cluster-server/test-cluster-server.cpp b/src/app/clusters/test-cluster-server/test-cluster-server.cpp index 28f8f44b4a7824..1c50f95dcebabb 100644 --- a/src/app/clusters/test-cluster-server/test-cluster-server.cpp +++ b/src/app/clusters/test-cluster-server/test-cluster-server.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp b/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp index 78cb2db208d5f7..44ab2baeb356dd 100644 --- a/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp +++ b/src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-server.cpp @@ -25,8 +25,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/app/data-model/DecodableList.h b/src/app/data-model/DecodableList.h index ce1821e9510933..bff54ca532bbde 100644 --- a/src/app/data-model/DecodableList.h +++ b/src/app/data-model/DecodableList.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include namespace chip { namespace app { diff --git a/src/app/data-model/Decode.h b/src/app/data-model/Decode.h index 6e31d22b4aafb4..5124fa44337a52 100644 --- a/src/app/data-model/Decode.h +++ b/src/app/data-model/Decode.h @@ -23,8 +23,8 @@ #include #include #include -#include #include +#include #include namespace chip { diff --git a/src/app/data-model/Encode.h b/src/app/data-model/Encode.h index 14b87b8c458c9b..3e930a1c0ec24a 100644 --- a/src/app/data-model/Encode.h +++ b/src/app/data-model/Encode.h @@ -20,9 +20,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/src/app/data-model/List.h b/src/app/data-model/List.h index a68c3fb4ef6d5b..b48b79905fc522 100644 --- a/src/app/data-model/List.h +++ b/src/app/data-model/List.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include namespace chip { namespace app { diff --git a/src/app/data-model/TagBoundEncoder.h b/src/app/data-model/TagBoundEncoder.h index 8d844874d58348..464b8de6646002 100644 --- a/src/app/data-model/TagBoundEncoder.h +++ b/src/app/data-model/TagBoundEncoder.h @@ -20,7 +20,7 @@ #include #include // So we can encode lists -#include +#include #include /** diff --git a/src/app/tests/TestAclAttribute.cpp b/src/app/tests/TestAclAttribute.cpp index ca51e96401ebdc..8d17a94cccff81 100644 --- a/src/app/tests/TestAclAttribute.cpp +++ b/src/app/tests/TestAclAttribute.cpp @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/app/tests/TestAclEvent.cpp b/src/app/tests/TestAclEvent.cpp index 1238e7c7142ee3..be9b61affdb3ca 100644 --- a/src/app/tests/TestAclEvent.cpp +++ b/src/app/tests/TestAclEvent.cpp @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/app/tests/TestAttributePathExpandIterator.cpp b/src/app/tests/TestAttributePathExpandIterator.cpp index 72352f23aa2bfd..5daaec172efabc 100644 --- a/src/app/tests/TestAttributePathExpandIterator.cpp +++ b/src/app/tests/TestAttributePathExpandIterator.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/tests/TestBufferedReadCallback.cpp b/src/app/tests/TestBufferedReadCallback.cpp index bdd988593f63b5..3504a778e9e8ed 100644 --- a/src/app/tests/TestBufferedReadCallback.cpp +++ b/src/app/tests/TestBufferedReadCallback.cpp @@ -17,7 +17,7 @@ */ #include "app-common/zap-generated/ids/Attributes.h" -#include "lib/core/CHIPTLVTags.h" +#include "lib/core/TLVTags.h" #include "protocols/interaction_model/Constants.h" #include "system/SystemPacketBuffer.h" #include "system/TLVPacketBufferBackingStore.h" diff --git a/src/app/tests/TestClusterStateCache.cpp b/src/app/tests/TestClusterStateCache.cpp index 172de5dd4cc798..5c05959d0c452c 100644 --- a/src/app/tests/TestClusterStateCache.cpp +++ b/src/app/tests/TestClusterStateCache.cpp @@ -18,7 +18,7 @@ #include "app-common/zap-generated/ids/Attributes.h" #include "app-common/zap-generated/ids/Clusters.h" -#include "lib/core/CHIPTLVTags.h" +#include "lib/core/TLVTags.h" #include "protocols/interaction_model/Constants.h" #include "system/SystemPacketBuffer.h" #include "system/TLVPacketBufferBackingStore.h" diff --git a/src/app/tests/TestCommandInteraction.cpp b/src/app/tests/TestCommandInteraction.cpp index e023bf96750a9d..8e56ea37da970f 100644 --- a/src/app/tests/TestCommandInteraction.cpp +++ b/src/app/tests/TestCommandInteraction.cpp @@ -29,10 +29,10 @@ #include #include #include -#include -#include -#include #include +#include +#include +#include #include #include #include diff --git a/src/app/tests/TestDataModelSerialization.cpp b/src/app/tests/TestDataModelSerialization.cpp index 9756f7b48c167e..1ae3c537d95282 100644 --- a/src/app/tests/TestDataModelSerialization.cpp +++ b/src/app/tests/TestDataModelSerialization.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/tests/TestEventLogging.cpp b/src/app/tests/TestEventLogging.cpp index 434275182de7b5..a3e1abe03b8b95 100644 --- a/src/app/tests/TestEventLogging.cpp +++ b/src/app/tests/TestEventLogging.cpp @@ -30,9 +30,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/app/tests/TestEventOverflow.cpp b/src/app/tests/TestEventOverflow.cpp index f7709b79260374..7091b51701278b 100644 --- a/src/app/tests/TestEventOverflow.cpp +++ b/src/app/tests/TestEventOverflow.cpp @@ -28,9 +28,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/app/tests/TestFabricScopedEventLogging.cpp b/src/app/tests/TestFabricScopedEventLogging.cpp index 563ca999601404..52f791ba947fb3 100644 --- a/src/app/tests/TestFabricScopedEventLogging.cpp +++ b/src/app/tests/TestFabricScopedEventLogging.cpp @@ -30,9 +30,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/app/tests/TestInteractionModelEngine.cpp b/src/app/tests/TestInteractionModelEngine.cpp index 297cd50f8786a1..a7ebc2b49320fd 100644 --- a/src/app/tests/TestInteractionModelEngine.cpp +++ b/src/app/tests/TestInteractionModelEngine.cpp @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/app/tests/TestMessageDef.cpp b/src/app/tests/TestMessageDef.cpp index caecbc360493fc..78f4be39b1b9a6 100644 --- a/src/app/tests/TestMessageDef.cpp +++ b/src/app/tests/TestMessageDef.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/tests/TestReadInteraction.cpp b/src/app/tests/TestReadInteraction.cpp index 3333e97d7ac81e..ee526f4fd6ce5e 100644 --- a/src/app/tests/TestReadInteraction.cpp +++ b/src/app/tests/TestReadInteraction.cpp @@ -34,9 +34,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/app/tests/TestReportingEngine.cpp b/src/app/tests/TestReportingEngine.cpp index f95040a0314a05..6921ea66d711b0 100644 --- a/src/app/tests/TestReportingEngine.cpp +++ b/src/app/tests/TestReportingEngine.cpp @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/app/tests/TestTimedHandler.cpp b/src/app/tests/TestTimedHandler.cpp index 6c081e27428a94..920ec010518acc 100644 --- a/src/app/tests/TestTimedHandler.cpp +++ b/src/app/tests/TestTimedHandler.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/tests/TestWriteInteraction.cpp b/src/app/tests/TestWriteInteraction.cpp index d984b0c9e5dd07..6026333050665c 100644 --- a/src/app/tests/TestWriteInteraction.cpp +++ b/src/app/tests/TestWriteInteraction.cpp @@ -21,9 +21,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/app/tests/integration/common.cpp b/src/app/tests/integration/common.cpp index 8cf4bb4cc8a274..5b3c231d3f9459 100644 --- a/src/app/tests/integration/common.cpp +++ b/src/app/tests/integration/common.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/util/attribute-storage-null-handling.h b/src/app/util/attribute-storage-null-handling.h index e1167e6d57a1e7..207cea1c0bdfdb 100644 --- a/src/app/util/attribute-storage-null-handling.h +++ b/src/app/util/attribute-storage-null-handling.h @@ -17,7 +17,7 @@ #pragma once -#include +#include #include #include #include diff --git a/src/app/util/binding-table.h b/src/app/util/binding-table.h index d6aa4d7f440ceb..20258ecdb2be88 100644 --- a/src/app/util/binding-table.h +++ b/src/app/util/binding-table.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include namespace chip { diff --git a/src/app/util/ember-compatibility-functions.cpp b/src/app/util/ember-compatibility-functions.cpp index 683da9cd45e455..b4852caa022429 100644 --- a/src/app/util/ember-compatibility-functions.cpp +++ b/src/app/util/ember-compatibility-functions.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/util/mock/Constants.h b/src/app/util/mock/Constants.h index e1f38dd09913ca..a9017a58fba2da 100644 --- a/src/app/util/mock/Constants.h +++ b/src/app/util/mock/Constants.h @@ -25,8 +25,8 @@ #include #include -#include #include +#include namespace chip { namespace Test { diff --git a/src/app/util/mock/attribute-storage.cpp b/src/app/util/mock/attribute-storage.cpp index 1276db759fc37b..47a3afb296c0d9 100644 --- a/src/app/util/mock/attribute-storage.cpp +++ b/src/app/util/mock/attribute-storage.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h index e98c9116881c90..cc3588fa17a38a 100644 --- a/src/controller/CHIPDeviceController.h +++ b/src/controller/CHIPDeviceController.h @@ -49,8 +49,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/controller/ExampleOperationalCredentialsIssuer.cpp b/src/controller/ExampleOperationalCredentialsIssuer.cpp index 42494f782c429e..7b120c73d30337 100644 --- a/src/controller/ExampleOperationalCredentialsIssuer.cpp +++ b/src/controller/ExampleOperationalCredentialsIssuer.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/controller/java/AndroidDeviceControllerWrapper.cpp b/src/controller/java/AndroidDeviceControllerWrapper.cpp index 4f51220f910470..0d479a845c1260 100644 --- a/src/controller/java/AndroidDeviceControllerWrapper.cpp +++ b/src/controller/java/AndroidDeviceControllerWrapper.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/controller/java/AndroidOperationalCredentialsIssuer.cpp b/src/controller/java/AndroidOperationalCredentialsIssuer.cpp index 27766fc81eb446..d9fc3d41adfd93 100644 --- a/src/controller/java/AndroidOperationalCredentialsIssuer.cpp +++ b/src/controller/java/AndroidOperationalCredentialsIssuer.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/controller/java/CHIPAttributeTLVValueDecoder.h b/src/controller/java/CHIPAttributeTLVValueDecoder.h index 41f6567fe69e2a..6abf28a9e9a167 100644 --- a/src/controller/java/CHIPAttributeTLVValueDecoder.h +++ b/src/controller/java/CHIPAttributeTLVValueDecoder.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include namespace chip { diff --git a/src/controller/java/CHIPEventTLVValueDecoder.h b/src/controller/java/CHIPEventTLVValueDecoder.h index 963e71b86d8ce5..12ddc2cfde0481 100644 --- a/src/controller/java/CHIPEventTLVValueDecoder.h +++ b/src/controller/java/CHIPEventTLVValueDecoder.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include namespace chip { diff --git a/src/controller/python/ChipDeviceController-Discovery.cpp b/src/controller/python/ChipDeviceController-Discovery.cpp index 36da3a8eedb0d1..98a82815d3bd2f 100644 --- a/src/controller/python/ChipDeviceController-Discovery.cpp +++ b/src/controller/python/ChipDeviceController-Discovery.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include using namespace chip; diff --git a/src/controller/python/ChipDeviceController-ScriptBinding.cpp b/src/controller/python/ChipDeviceController-ScriptBinding.cpp index 8115266991c2cd..d055bab67addce 100644 --- a/src/controller/python/ChipDeviceController-ScriptBinding.cpp +++ b/src/controller/python/ChipDeviceController-ScriptBinding.cpp @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/controller/tests/data_model/TestCommands.cpp b/src/controller/tests/data_model/TestCommands.cpp index 9ecac05df1f161..5714cc0f9877a7 100644 --- a/src/controller/tests/data_model/TestCommands.cpp +++ b/src/controller/tests/data_model/TestCommands.cpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/credentials/CHIPCert.cpp b/src/credentials/CHIPCert.cpp index 57a97537f34c92..969448fe858d40 100644 --- a/src/credentials/CHIPCert.cpp +++ b/src/credentials/CHIPCert.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/credentials/CHIPCert.h b/src/credentials/CHIPCert.h index af45c71957fad8..7ceac66222ab36 100644 --- a/src/credentials/CHIPCert.h +++ b/src/credentials/CHIPCert.h @@ -34,9 +34,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/credentials/CHIPCertFromX509.cpp b/src/credentials/CHIPCertFromX509.cpp index f6bb3aa0847726..d07b2a515b8644 100644 --- a/src/credentials/CHIPCertFromX509.cpp +++ b/src/credentials/CHIPCertFromX509.cpp @@ -35,8 +35,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/credentials/CHIPCertToX509.cpp b/src/credentials/CHIPCertToX509.cpp index 44632ecde0003a..6342e90c0a7b99 100644 --- a/src/credentials/CHIPCertToX509.cpp +++ b/src/credentials/CHIPCertToX509.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/credentials/CertificationDeclaration.cpp b/src/credentials/CertificationDeclaration.cpp index d18c26e5942371..cbe79dd2d32ced 100644 --- a/src/credentials/CertificationDeclaration.cpp +++ b/src/credentials/CertificationDeclaration.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include namespace chip { diff --git a/src/credentials/CertificationDeclaration.h b/src/credentials/CertificationDeclaration.h index 5485b1c0dbe768..8d4b6b2662e6aa 100644 --- a/src/credentials/CertificationDeclaration.h +++ b/src/credentials/CertificationDeclaration.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/credentials/DeviceAttestationConstructor.cpp b/src/credentials/DeviceAttestationConstructor.cpp index 6056ed1a0f9fb7..a6a1c97c8d6e19 100644 --- a/src/credentials/DeviceAttestationConstructor.cpp +++ b/src/credentials/DeviceAttestationConstructor.cpp @@ -17,7 +17,7 @@ #include "DeviceAttestationConstructor.h" #include "DeviceAttestationVendorReserved.h" -#include +#include #include #include diff --git a/src/credentials/DeviceAttestationVendorReserved.h b/src/credentials/DeviceAttestationVendorReserved.h index 7c77000e5884ce..6e674179b1eb2f 100644 --- a/src/credentials/DeviceAttestationVendorReserved.h +++ b/src/credentials/DeviceAttestationVendorReserved.h @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/credentials/FabricTable.h b/src/credentials/FabricTable.h index 7dbc84cc849e73..7389efe79c8fb5 100644 --- a/src/credentials/FabricTable.h +++ b/src/credentials/FabricTable.h @@ -37,9 +37,9 @@ #endif #include #include -#include #include #include +#include #include #include #include diff --git a/src/credentials/GroupDataProviderImpl.cpp b/src/credentials/GroupDataProviderImpl.cpp index fde6cec2343ad8..29e83f87038301 100644 --- a/src/credentials/GroupDataProviderImpl.cpp +++ b/src/credentials/GroupDataProviderImpl.cpp @@ -16,7 +16,7 @@ */ #include #include -#include +#include #include #include #include diff --git a/src/credentials/LastKnownGoodTime.h b/src/credentials/LastKnownGoodTime.h index d4830d9283aa01..4624639fa74e25 100644 --- a/src/credentials/LastKnownGoodTime.h +++ b/src/credentials/LastKnownGoodTime.h @@ -22,8 +22,8 @@ #pragma once #include -#include #include +#include #include namespace chip { diff --git a/src/credentials/PersistentStorageOpCertStore.cpp b/src/credentials/PersistentStorageOpCertStore.cpp index f70ef046b2027a..a2c0eb8bfb09d3 100644 --- a/src/credentials/PersistentStorageOpCertStore.cpp +++ b/src/credentials/PersistentStorageOpCertStore.cpp @@ -18,8 +18,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/credentials/tests/TestChipCert.cpp b/src/credentials/tests/TestChipCert.cpp index 97db2695424514..39c16f1de3260b 100644 --- a/src/credentials/tests/TestChipCert.cpp +++ b/src/credentials/tests/TestChipCert.cpp @@ -28,8 +28,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/credentials/tests/TestDeviceAttestationConstruction.cpp b/src/credentials/tests/TestDeviceAttestationConstruction.cpp index 19987d31d475d4..f9f285f35d9c81 100644 --- a/src/credentials/tests/TestDeviceAttestationConstruction.cpp +++ b/src/credentials/tests/TestDeviceAttestationConstruction.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/credentials/tests/TestGroupDataProvider.cpp b/src/credentials/tests/TestGroupDataProvider.cpp index 6d28b525319215..0f320cce8a8bbb 100644 --- a/src/credentials/tests/TestGroupDataProvider.cpp +++ b/src/credentials/tests/TestGroupDataProvider.cpp @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include #include diff --git a/src/crypto/PersistentStorageOperationalKeystore.cpp b/src/crypto/PersistentStorageOperationalKeystore.cpp index 52a16a57b78d38..f578c5a8ad74dc 100644 --- a/src/crypto/PersistentStorageOperationalKeystore.cpp +++ b/src/crypto/PersistentStorageOperationalKeystore.cpp @@ -18,8 +18,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/crypto/tests/CHIPCryptoPALTest.cpp b/src/crypto/tests/CHIPCryptoPALTest.cpp index c8b2810ddd0f40..ae96316fff0002 100644 --- a/src/crypto/tests/CHIPCryptoPALTest.cpp +++ b/src/crypto/tests/CHIPCryptoPALTest.cpp @@ -65,7 +65,7 @@ #include #include -#include +#include #include #include diff --git a/src/darwin/Framework/CHIP/MTRAttributeTLVValueDecoder_Internal.h b/src/darwin/Framework/CHIP/MTRAttributeTLVValueDecoder_Internal.h index fd1540645ebf8e..7338767d15979a 100644 --- a/src/darwin/Framework/CHIP/MTRAttributeTLVValueDecoder_Internal.h +++ b/src/darwin/Framework/CHIP/MTRAttributeTLVValueDecoder_Internal.h @@ -22,7 +22,7 @@ #include #include -#include +#include NS_ASSUME_NONNULL_BEGIN diff --git a/src/darwin/Framework/CHIP/MTRBaseClusterUtils.h b/src/darwin/Framework/CHIP/MTRBaseClusterUtils.h index 0f8f1dcefb6bf8..97251162f5162b 100644 --- a/src/darwin/Framework/CHIP/MTRBaseClusterUtils.h +++ b/src/darwin/Framework/CHIP/MTRBaseClusterUtils.h @@ -22,8 +22,8 @@ #include #include #include -#include #include +#include #include NS_ASSUME_NONNULL_BEGIN diff --git a/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h b/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h index 4716bbc3567b9c..dc2dda374db49e 100644 --- a/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h +++ b/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h @@ -27,8 +27,8 @@ #include #include #include -#include #include +#include #include diff --git a/src/darwin/Framework/CHIP/MTREventTLVValueDecoder_Internal.h b/src/darwin/Framework/CHIP/MTREventTLVValueDecoder_Internal.h index d66c58ea59de9c..bd5c412a8451a6 100644 --- a/src/darwin/Framework/CHIP/MTREventTLVValueDecoder_Internal.h +++ b/src/darwin/Framework/CHIP/MTREventTLVValueDecoder_Internal.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include NS_ASSUME_NONNULL_BEGIN diff --git a/src/darwin/Framework/CHIP/MTRIMDispatch.mm b/src/darwin/Framework/CHIP/MTRIMDispatch.mm index 7d0594bd87aefa..3884d0236960f0 100644 --- a/src/darwin/Framework/CHIP/MTRIMDispatch.mm +++ b/src/darwin/Framework/CHIP/MTRIMDispatch.mm @@ -34,9 +34,9 @@ #include #include #include -#include #include #include +#include #include /** diff --git a/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm b/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm index 59a8fe31e47933..467528a01252d9 100644 --- a/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm +++ b/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm @@ -31,8 +31,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/lib/asn1/ASN1Writer.cpp b/src/lib/asn1/ASN1Writer.cpp index aea03a559bb914..09b73d49823370 100644 --- a/src/lib/asn1/ASN1Writer.cpp +++ b/src/lib/asn1/ASN1Writer.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/lib/asn1/tests/TestASN1.cpp b/src/lib/asn1/tests/TestASN1.cpp index 29e56a11e6ab47..2560a58850d22d 100644 --- a/src/lib/asn1/tests/TestASN1.cpp +++ b/src/lib/asn1/tests/TestASN1.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include using namespace chip; diff --git a/src/lib/core/BUILD.gn b/src/lib/core/BUILD.gn index 5a7d12b40dd793..abf38ea366dd3f 100644 --- a/src/lib/core/BUILD.gn +++ b/src/lib/core/BUILD.gn @@ -101,14 +101,6 @@ static_library("core") { "CHIPError.h", "CHIPKeyIds.cpp", "CHIPKeyIds.h", - "CHIPTLV.h", - "CHIPTLVDebug.cpp", - "CHIPTLVReader.cpp", - "CHIPTLVTags.h", - "CHIPTLVTypes.h", - "CHIPTLVUpdater.cpp", - "CHIPTLVUtilities.cpp", - "CHIPTLVWriter.cpp", "ClusterEnums.h", "DataModelTypes.h", "GroupId.h", @@ -117,6 +109,14 @@ static_library("core") { "OTAImageHeader.h", "PasscodeId.h", "PeerId.h", + "TLV.h", + "TLVDebug.cpp", + "TLVReader.cpp", + "TLVTags.h", + "TLVTypes.h", + "TLVUpdater.cpp", + "TLVUtilities.cpp", + "TLVWriter.cpp", ] cflags = [ "-Wconversion" ] diff --git a/src/lib/core/CHIPCircularTLVBuffer.cpp b/src/lib/core/CHIPCircularTLVBuffer.cpp index 5d89e9464d347a..26cd733a20b862 100644 --- a/src/lib/core/CHIPCircularTLVBuffer.cpp +++ b/src/lib/core/CHIPCircularTLVBuffer.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include diff --git a/src/lib/core/CHIPCircularTLVBuffer.h b/src/lib/core/CHIPCircularTLVBuffer.h index fc77dc8345a233..9873e7bce925fe 100644 --- a/src/lib/core/CHIPCircularTLVBuffer.h +++ b/src/lib/core/CHIPCircularTLVBuffer.h @@ -30,9 +30,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/lib/core/OTAImageHeader.cpp b/src/lib/core/OTAImageHeader.cpp index 51088bbab90cc4..57aab4475b910d 100644 --- a/src/lib/core/OTAImageHeader.cpp +++ b/src/lib/core/OTAImageHeader.cpp @@ -17,7 +17,7 @@ #include "OTAImageHeader.h" -#include +#include #include #include diff --git a/src/lib/core/CHIPTLV.h b/src/lib/core/TLV.h similarity index 99% rename from src/lib/core/CHIPTLV.h rename to src/lib/core/TLV.h index 3ab437560273d5..984d75d1e22b73 100644 --- a/src/lib/core/CHIPTLV.h +++ b/src/lib/core/TLV.h @@ -28,8 +28,8 @@ #pragma once #include -#include -#include +#include +#include #include #include @@ -2266,7 +2266,7 @@ class DLL_EXPORT TLVWriter void SetCloseContainerReserved(bool aCloseContainerReserved) { mCloseContainerReserved = aCloseContainerReserved; } #if CONFIG_HAVE_VCBPRINTF - static void CHIPTLVWriterPutcharCB(uint8_t c, void * appState); + static void TLVWriterPutcharCB(uint8_t c, void * appState); #endif CHIP_ERROR WriteElementHead(TLVElementType elemType, Tag tag, uint64_t lenOrVal); CHIP_ERROR WriteElementWithData(TLVType type, Tag tag, const uint8_t * data, uint32_t dataLen); @@ -2316,7 +2316,7 @@ class ScopedBufferTLVWriter : public TLVWriter * Semantically, the TLVUpdater object functions like a union of the TLVReader and TLVWriter. The * TLVUpdater methods have more or less similar meanings as similarly named counterparts in * TLVReader/TLVWriter. Where there are differences in the semantics, the differences are clearly - * documented in the function's comment section in CHIPTLVUpdater.cpp. + * documented in the function's comment section in TLVUpdater.cpp. * * One particularly important note about the TLVUpdater's PutBytes() and PutString() methods is that * it can leave the encoding in a corrupt state with only the element header written when an diff --git a/src/lib/core/CHIPTLVData.hpp b/src/lib/core/TLVData.h similarity index 99% rename from src/lib/core/CHIPTLVData.hpp rename to src/lib/core/TLVData.h index 9611fa7c194eb6..343203783b0246 100644 --- a/src/lib/core/CHIPTLVData.hpp +++ b/src/lib/core/TLVData.h @@ -30,7 +30,7 @@ #include -#include +#include /* * @brief Integral truncate L to the least significant 32-bit diff --git a/src/lib/core/CHIPTLVDebug.cpp b/src/lib/core/TLVDebug.cpp similarity index 98% rename from src/lib/core/CHIPTLVDebug.cpp rename to src/lib/core/TLVDebug.cpp index 5b1885879f17b9..74e6d5ce5377f1 100644 --- a/src/lib/core/CHIPTLVDebug.cpp +++ b/src/lib/core/TLVDebug.cpp @@ -31,9 +31,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/lib/core/CHIPTLVDebug.hpp b/src/lib/core/TLVDebug.h similarity index 93% rename from src/lib/core/CHIPTLVDebug.hpp rename to src/lib/core/TLVDebug.h index 18390a59bdd454..5c18236880c01d 100644 --- a/src/lib/core/CHIPTLVDebug.hpp +++ b/src/lib/core/TLVDebug.h @@ -23,14 +23,13 @@ * */ -#ifndef CHIPTLVDEBUG_HPP -#define CHIPTLVDEBUG_HPP +#pragma once #include #include #include -#include +#include namespace chip { @@ -69,5 +68,3 @@ extern CHIP_ERROR Dump(const TLVReader & aReader, DumpWriter aWriter); } // namespace TLV } // namespace chip - -#endif // CHIPTLVDEBUG_HPP diff --git a/src/lib/core/CHIPTLVReader.cpp b/src/lib/core/TLVReader.cpp similarity index 99% rename from src/lib/core/CHIPTLVReader.cpp rename to src/lib/core/TLVReader.cpp index 5d175eb35b7108..d2a2718977dd3a 100644 --- a/src/lib/core/CHIPTLVReader.cpp +++ b/src/lib/core/TLVReader.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/lib/core/CHIPTLVTags.h b/src/lib/core/TLVTags.h similarity index 100% rename from src/lib/core/CHIPTLVTags.h rename to src/lib/core/TLVTags.h diff --git a/src/lib/core/CHIPTLVTypes.h b/src/lib/core/TLVTypes.h similarity index 100% rename from src/lib/core/CHIPTLVTypes.h rename to src/lib/core/TLVTypes.h diff --git a/src/lib/core/CHIPTLVUpdater.cpp b/src/lib/core/TLVUpdater.cpp similarity index 99% rename from src/lib/core/CHIPTLVUpdater.cpp rename to src/lib/core/TLVUpdater.cpp index a41abc1532843e..c1793919bc7258 100644 --- a/src/lib/core/CHIPTLVUpdater.cpp +++ b/src/lib/core/TLVUpdater.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include namespace chip { diff --git a/src/lib/core/CHIPTLVUtilities.cpp b/src/lib/core/TLVUtilities.cpp similarity index 99% rename from src/lib/core/CHIPTLVUtilities.cpp rename to src/lib/core/TLVUtilities.cpp index 5292655b7934c7..443adc6ef79ca5 100644 --- a/src/lib/core/CHIPTLVUtilities.cpp +++ b/src/lib/core/TLVUtilities.cpp @@ -23,8 +23,8 @@ * */ -#include -#include +#include +#include #include namespace chip { diff --git a/src/lib/core/CHIPTLVUtilities.hpp b/src/lib/core/TLVUtilities.h similarity index 94% rename from src/lib/core/CHIPTLVUtilities.hpp rename to src/lib/core/TLVUtilities.h index 53402591f9e1e2..8813b9f8b558d2 100644 --- a/src/lib/core/CHIPTLVUtilities.hpp +++ b/src/lib/core/TLVUtilities.h @@ -23,14 +23,13 @@ * */ -#ifndef CHIPTLVUTILITIES_HPP -#define CHIPTLVUTILITIES_HPP +#pragma once #include #include #include -#include +#include namespace chip { @@ -64,5 +63,3 @@ extern CHIP_ERROR Find(const TLVReader & aReader, IterateHandler aHandler, void } // namespace TLV } // namespace chip - -#endif // CHIPTLVUTILITIES_HPP diff --git a/src/lib/core/CHIPTLVWriter.cpp b/src/lib/core/TLVWriter.cpp similarity index 98% rename from src/lib/core/CHIPTLVWriter.cpp rename to src/lib/core/TLVWriter.cpp index 8a1eb7021edb66..41bfcfd4bc2c65 100644 --- a/src/lib/core/CHIPTLVWriter.cpp +++ b/src/lib/core/TLVWriter.cpp @@ -25,7 +25,7 @@ #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS #endif -#include +#include #include #include @@ -284,7 +284,7 @@ CHIP_ERROR TLVWriter::PutStringF(Tag tag, const char * fmt, ...) // emits a single character. The callback performs a function // identical to putchar. -void TLVWriter::CHIPTLVWriterPutcharCB(uint8_t c, void * appState) +void TLVWriter::TLVWriterPutcharCB(uint8_t c, void * appState) { TLVWriter * w = static_cast(appState); w->WriteData(&c, sizeof(c)); @@ -379,7 +379,7 @@ CHIP_ERROR TLVWriter::VPutStringF(Tag tag, const char * fmt, va_list ap) va_copy(aq, ap); - vcbprintf(CHIPTLVWriterPutcharCB, this, dataLen, fmt, aq); + vcbprintf(TLVWriterPutcharCB, this, dataLen, fmt, aq); va_end(aq); @@ -414,7 +414,7 @@ CHIP_ERROR TLVWriter::CopyElement(TLVReader & reader) return CopyElement(reader.GetTag(), reader); } -const size_t kCHIPTLVCopyChunkSize = 16; +const size_t kTLVCopyChunkSize = 16; CHIP_ERROR TLVWriter::CopyElement(Tag tag, TLVReader & reader) { @@ -422,7 +422,7 @@ CHIP_ERROR TLVWriter::CopyElement(Tag tag, TLVReader & reader) uint64_t elemLenOrVal = reader.mElemLenOrVal; TLVReader readerHelper; // used to figure out the length of the element and read data of the element uint32_t copyDataLen; - uint8_t chunk[kCHIPTLVCopyChunkSize]; + uint8_t chunk[kTLVCopyChunkSize]; VerifyOrReturnError(elemType != TLVElementType::NotSpecified && elemType != TLVElementType::EndOfContainer, CHIP_ERROR_INCORRECT_STATE); @@ -442,7 +442,7 @@ CHIP_ERROR TLVWriter::CopyElement(Tag tag, TLVReader & reader) while (copyDataLen > 0) { - uint32_t chunkSize = copyDataLen > kCHIPTLVCopyChunkSize ? kCHIPTLVCopyChunkSize : copyDataLen; + uint32_t chunkSize = copyDataLen > kTLVCopyChunkSize ? kTLVCopyChunkSize : copyDataLen; ReturnErrorOnFailure(readerHelper.ReadData(chunk, chunkSize)); ReturnErrorOnFailure(WriteData(chunk, chunkSize)); diff --git a/src/lib/core/tests/BUILD.gn b/src/lib/core/tests/BUILD.gn index 74e2cb932fbcda..295f7a337d09dd 100644 --- a/src/lib/core/tests/BUILD.gn +++ b/src/lib/core/tests/BUILD.gn @@ -26,10 +26,10 @@ chip_test_suite("tests") { "TestCATValues.cpp", "TestCHIPCallback.cpp", "TestCHIPErrorStr.cpp", - "TestCHIPTLV.cpp", "TestOTAImageHeader.cpp", "TestOptional.cpp", "TestReferenceCounted.cpp", + "TestTLV.cpp", ] cflags = [ "-Wconversion" ] diff --git a/src/lib/core/tests/FuzzTlvReader.cpp b/src/lib/core/tests/FuzzTlvReader.cpp index 2628d661e7c53c..d0dc2ca9599270 100644 --- a/src/lib/core/tests/FuzzTlvReader.cpp +++ b/src/lib/core/tests/FuzzTlvReader.cpp @@ -1,8 +1,8 @@ #include #include -#include "lib/core/CHIPTLV.h" -#include "lib/core/CHIPTLVUtilities.hpp" +#include "lib/core/TLV.h" +#include "lib/core/TLVUtilities.h" using chip::TLV::TLVReader; diff --git a/src/lib/core/tests/TestCHIPTLV.cpp b/src/lib/core/tests/TestTLV.cpp similarity index 97% rename from src/lib/core/tests/TestCHIPTLV.cpp rename to src/lib/core/tests/TestTLV.cpp index 60d87f93bedf0e..b945a5f0f6aa5d 100644 --- a/src/lib/core/tests/TestCHIPTLV.cpp +++ b/src/lib/core/tests/TestTLV.cpp @@ -28,10 +28,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -1788,7 +1788,7 @@ static CHIP_ERROR FindContainerWithElement(const TLVReader & aReader, size_t aDe /** * Test CHIP TLV Utilities */ -void CheckCHIPTLVUtilities(nlTestSuite * inSuite, void * inContext) +void CheckTLVUtilities(nlTestSuite * inSuite, void * inContext) { uint8_t buf[2048]; TLVWriter writer; @@ -1881,7 +1881,7 @@ void CheckCHIPTLVUtilities(nlTestSuite * inSuite, void * inContext) /** * Test CHIP TLV Empty Find */ -void CheckCHIPTLVEmptyFind(nlTestSuite * inSuite, void * inContext) +void CheckTLVEmptyFind(nlTestSuite * inSuite, void * inContext) { uint8_t buf[30]; TLVWriter writer; @@ -2616,7 +2616,7 @@ void CheckCircularTLVBufferEdge(nlTestSuite * inSuite, void * inContext) TestEnd(inSuite, reader); } -void CheckCHIPTLVPutStringF(nlTestSuite * inSuite, void * inContext) +void CheckTLVPutStringF(nlTestSuite * inSuite, void * inContext) { const size_t bufsize = 24; char strBuffer[bufsize]; @@ -2646,7 +2646,7 @@ void CheckCHIPTLVPutStringF(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(inSuite, strncmp(valStr, strBuffer, bufsize) == 0); } -void CheckCHIPTLVPutStringSpan(nlTestSuite * inSuite, void * inContext) +void CheckTLVPutStringSpan(nlTestSuite * inSuite, void * inContext) { const size_t bufsize = 24; char strBuffer[bufsize] = "Sample string"; @@ -2695,7 +2695,7 @@ void CheckCHIPTLVPutStringSpan(nlTestSuite * inSuite, void * inContext) } } -void CheckCHIPTLVPutStringFCircular(nlTestSuite * inSuite, void * inContext) +void CheckTLVPutStringFCircular(nlTestSuite * inSuite, void * inContext) { const size_t bufsize = 40; char strBuffer[bufsize]; @@ -2760,7 +2760,7 @@ void CheckCHIPTLVPutStringFCircular(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(inSuite, strncmp(valStr, strBuffer, bufsize) == 0); } -void CheckCHIPTLVByteSpan(nlTestSuite * inSuite, void * inContext) +void CheckTLVByteSpan(nlTestSuite * inSuite, void * inContext) { const size_t bufSize = 14; uint8_t bytesBuffer[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 }; @@ -2789,7 +2789,7 @@ void CheckCHIPTLVByteSpan(nlTestSuite * inSuite, void * inContext) NL_TEST_ASSERT(inSuite, memcmp(readerSpan.data(), bytesBuffer, sizeof(bytesBuffer)) == 0); } -void CheckCHIPTLVSkipCircular(nlTestSuite * inSuite, void * inContext) +void CheckTLVSkipCircular(nlTestSuite * inSuite, void * inContext) { const size_t bufsize = 40; // large enough s.t. 2 elements fit, 3rd causes eviction uint8_t backingStore[bufsize]; @@ -2912,7 +2912,7 @@ void CheckStrictAliasing(nlTestSuite * inSuite, void * inContext) /** * Test CHIP TLV Writer Copy Container */ -void TestCHIPTLVWriterCopyContainer(nlTestSuite * inSuite) +void TestTLVWriterCopyContainer(nlTestSuite * inSuite) { uint8_t buf[2048]; @@ -2958,7 +2958,7 @@ void TestCHIPTLVWriterCopyContainer(nlTestSuite * inSuite) /** * Test CHIP TLV Writer Copy Element */ -void TestCHIPTLVWriterCopyElement(nlTestSuite * inSuite) +void TestTLVWriterCopyElement(nlTestSuite * inSuite) { CHIP_ERROR err; uint8_t expectedBuf[2048], testBuf[2048]; @@ -3094,7 +3094,7 @@ void PreserveSizeWrite(nlTestSuite * inSuite, TLVWriter & writer, bool preserveS /** * Test CHIP TLV Writer with Preserve Size */ -void TestCHIPTLVWriterPreserveSize(nlTestSuite * inSuite) +void TestTLVWriterPreserveSize(nlTestSuite * inSuite) { uint8_t buf[2048]; TLVWriter writer; @@ -3111,7 +3111,7 @@ void TestCHIPTLVWriterPreserveSize(nlTestSuite * inSuite) /** * Test error handling of CHIP TLV Writer */ -void TestCHIPTLVWriterErrorHandling(nlTestSuite * inSuite) +void TestTLVWriterErrorHandling(nlTestSuite * inSuite) { CHIP_ERROR err; uint8_t buf[2048]; @@ -3160,7 +3160,7 @@ void TestCHIPTLVWriterErrorHandling(nlTestSuite * inSuite) NL_TEST_ASSERT(inSuite, err == CHIP_ERROR_INVALID_ARGUMENT); } -void TestCHIPTLVEmptyString(nlTestSuite * inSuite) +void TestTLVEmptyString(nlTestSuite * inSuite) { uint8_t buf[2]; TLVWriter writer; @@ -3192,17 +3192,17 @@ void TestCHIPTLVEmptyString(nlTestSuite * inSuite) /** * Test CHIP TLV Writer */ -void CheckCHIPTLVWriter(nlTestSuite * inSuite, void * inContext) +void CheckTLVWriter(nlTestSuite * inSuite, void * inContext) { - TestCHIPTLVWriterCopyContainer(inSuite); + TestTLVWriterCopyContainer(inSuite); - TestCHIPTLVWriterCopyElement(inSuite); + TestTLVWriterCopyElement(inSuite); - TestCHIPTLVWriterPreserveSize(inSuite); + TestTLVWriterPreserveSize(inSuite); - TestCHIPTLVWriterErrorHandling(inSuite); + TestTLVWriterErrorHandling(inSuite); - TestCHIPTLVEmptyString(inSuite); + TestTLVEmptyString(inSuite); } void SkipNonContainer(nlTestSuite * inSuite) @@ -3265,7 +3265,7 @@ void NextContainer(nlTestSuite * inSuite) /** * Test CHIP TLV Reader Skip functions */ -void TestCHIPTLVReaderSkip(nlTestSuite * inSuite) +void TestTLVReaderSkip(nlTestSuite * inSuite) { SkipNonContainer(inSuite); @@ -3277,7 +3277,7 @@ void TestCHIPTLVReaderSkip(nlTestSuite * inSuite) /** * Test CHIP TLV Reader Dup functions */ -void TestCHIPTLVReaderDup(nlTestSuite * inSuite) +void TestTLVReaderDup(nlTestSuite * inSuite) { TLVReader reader; @@ -3407,7 +3407,7 @@ void TestCHIPTLVReaderDup(nlTestSuite * inSuite) /** * Test error handling of CHIP TLV Reader */ -void TestCHIPTLVReaderErrorHandling(nlTestSuite * inSuite) +void TestTLVReaderErrorHandling(nlTestSuite * inSuite) { CHIP_ERROR err; uint8_t buf[2048] = { 0 }; @@ -3477,7 +3477,7 @@ void TestCHIPTLVReaderErrorHandling(nlTestSuite * inSuite) * Test that CHIP TLV reader returns an error when a read is requested that * would truncate the output. */ -void TestCHIPTLVReaderTruncatedReads(nlTestSuite * inSuite) +void TestTLVReaderTruncatedReads(nlTestSuite * inSuite) { uint8_t buf[2048]; TLVWriter writer; @@ -3507,7 +3507,7 @@ void TestCHIPTLVReaderTruncatedReads(nlTestSuite * inSuite) /** * Test CHIP TLV Reader in a use case */ -void TestCHIPTLVReaderInPractice(nlTestSuite * inSuite) +void TestTLVReaderInPractice(nlTestSuite * inSuite) { uint8_t buf[2048]; TLVWriter writer; @@ -3536,7 +3536,7 @@ void TestCHIPTLVReaderInPractice(nlTestSuite * inSuite) static_cast(1.0)); } -void TestCHIPTLVReader_NextOverContainer_ProcessElement(nlTestSuite * inSuite, TLVReader & reader, void * context) +void TestTLVReader_NextOverContainer_ProcessElement(nlTestSuite * inSuite, TLVReader & reader, void * context) { CHIP_ERROR err, nextRes1, nextRes2; TLVType outerContainerType; @@ -3571,17 +3571,17 @@ void TestCHIPTLVReader_NextOverContainer_ProcessElement(nlTestSuite * inSuite, T /** * Test using CHIP TLV Reader Next() method to skip over containers. */ -void TestCHIPTLVReader_NextOverContainer(nlTestSuite * inSuite) +void TestTLVReader_NextOverContainer(nlTestSuite * inSuite) { TLVReader reader; reader.Init(Encoding1); reader.ImplicitProfileId = TestProfile_2; - ForEachElement(inSuite, reader, nullptr, TestCHIPTLVReader_NextOverContainer_ProcessElement); + ForEachElement(inSuite, reader, nullptr, TestTLVReader_NextOverContainer_ProcessElement); } -void TestCHIPTLVReader_SkipOverContainer_ProcessElement(nlTestSuite * inSuite, TLVReader & reader, void * context) +void TestTLVReader_SkipOverContainer_ProcessElement(nlTestSuite * inSuite, TLVReader & reader, void * context) { CHIP_ERROR err; TLVType outerContainerType; @@ -3613,34 +3613,34 @@ void TestCHIPTLVReader_SkipOverContainer_ProcessElement(nlTestSuite * inSuite, T /** * Test using CHIP TLV Reader Skip() method to skip over containers. */ -void TestCHIPTLVReader_SkipOverContainer(nlTestSuite * inSuite) +void TestTLVReader_SkipOverContainer(nlTestSuite * inSuite) { TLVReader reader; reader.Init(Encoding1); reader.ImplicitProfileId = TestProfile_2; - ForEachElement(inSuite, reader, nullptr, TestCHIPTLVReader_SkipOverContainer_ProcessElement); + ForEachElement(inSuite, reader, nullptr, TestTLVReader_SkipOverContainer_ProcessElement); } /** * Test CHIP TLV Reader */ -void CheckCHIPTLVReader(nlTestSuite * inSuite, void * inContext) +void CheckTLVReader(nlTestSuite * inSuite, void * inContext) { - TestCHIPTLVReaderSkip(inSuite); + TestTLVReaderSkip(inSuite); - TestCHIPTLVReaderDup(inSuite); + TestTLVReaderDup(inSuite); - TestCHIPTLVReaderErrorHandling(inSuite); + TestTLVReaderErrorHandling(inSuite); - TestCHIPTLVReaderTruncatedReads(inSuite); + TestTLVReaderTruncatedReads(inSuite); - TestCHIPTLVReaderInPractice(inSuite); + TestTLVReaderInPractice(inSuite); - TestCHIPTLVReader_NextOverContainer(inSuite); + TestTLVReader_NextOverContainer(inSuite); - TestCHIPTLVReader_SkipOverContainer(inSuite); + TestTLVReader_SkipOverContainer(inSuite); } /** @@ -3767,7 +3767,7 @@ static void TestContainers(nlTestSuite * inSuite, void * inContext) /** * Test CHIP TLV Basics */ -static void CheckCHIPTLVBasics(nlTestSuite * inSuite, void * inContext) +static void CheckTLVBasics(nlTestSuite * inSuite, void * inContext) { TestItems(inSuite, inContext); TestContainers(inSuite, inContext); @@ -4391,7 +4391,7 @@ static void CheckGetByteView(nlTestSuite * inSuite, void * inContext) } } -static void CheckCHIPTLVScopedBuffer(nlTestSuite * inSuite, void * inContext) +static void CheckTLVScopedBuffer(nlTestSuite * inSuite, void * inContext) { Platform::ScopedMemoryBuffer buf; CHIP_ERROR err; @@ -4451,22 +4451,22 @@ static const nlTest sTests[] = NL_TEST_DEF("Pretty Octet String Print Test", CheckOctetStringPrettyPrinter), NL_TEST_DEF("Data Macro Test", CheckDataMacro), NL_TEST_DEF("Strict Aliasing Test", CheckStrictAliasing), - NL_TEST_DEF("CHIP TLV Basics", CheckCHIPTLVBasics), - NL_TEST_DEF("CHIP TLV Writer", CheckCHIPTLVWriter), - NL_TEST_DEF("CHIP TLV Reader", CheckCHIPTLVReader), - NL_TEST_DEF("CHIP TLV Utilities", CheckCHIPTLVUtilities), + NL_TEST_DEF("CHIP TLV Basics", CheckTLVBasics), + NL_TEST_DEF("CHIP TLV Writer", CheckTLVWriter), + NL_TEST_DEF("CHIP TLV Reader", CheckTLVReader), + NL_TEST_DEF("CHIP TLV Utilities", CheckTLVUtilities), NL_TEST_DEF("CHIP TLV Updater", CheckCHIPUpdater), - NL_TEST_DEF("CHIP TLV Empty Find", CheckCHIPTLVEmptyFind), + NL_TEST_DEF("CHIP TLV Empty Find", CheckTLVEmptyFind), NL_TEST_DEF("CHIP Circular TLV buffer, simple", CheckCircularTLVBufferSimple), NL_TEST_DEF("CHIP Circular TLV buffer, mid-buffer start", CheckCircularTLVBufferStartMidway), NL_TEST_DEF("CHIP Circular TLV buffer, straddle", CheckCircularTLVBufferEvictStraddlingEvent), NL_TEST_DEF("CHIP Circular TLV buffer, edge", CheckCircularTLVBufferEdge), - NL_TEST_DEF("CHIP TLV Printf", CheckCHIPTLVPutStringF), - NL_TEST_DEF("CHIP TLV String Span", CheckCHIPTLVPutStringSpan), - NL_TEST_DEF("CHIP TLV Printf, Circular TLV buf", CheckCHIPTLVPutStringFCircular), - NL_TEST_DEF("CHIP TLV Skip non-contiguous", CheckCHIPTLVSkipCircular), - NL_TEST_DEF("CHIP TLV ByteSpan", CheckCHIPTLVByteSpan), - NL_TEST_DEF("CHIP TLV Scoped Buffer", CheckCHIPTLVScopedBuffer), + NL_TEST_DEF("CHIP TLV Printf", CheckTLVPutStringF), + NL_TEST_DEF("CHIP TLV String Span", CheckTLVPutStringSpan), + NL_TEST_DEF("CHIP TLV Printf, Circular TLV buf", CheckTLVPutStringFCircular), + NL_TEST_DEF("CHIP TLV Skip non-contiguous", CheckTLVSkipCircular), + NL_TEST_DEF("CHIP TLV ByteSpan", CheckTLVByteSpan), + NL_TEST_DEF("CHIP TLV Scoped Buffer", CheckTLVScopedBuffer), NL_TEST_DEF("CHIP TLV Check reserve", CheckCloseContainerReserve), NL_TEST_DEF("CHIP TLV Reader Fuzz Test", TLVReaderFuzzTest), NL_TEST_DEF("CHIP TLV GetStringView Test", CheckGetStringView), @@ -4480,7 +4480,7 @@ static const nlTest sTests[] = /** * Set up the test suite. */ -int TestCHIPTLV_Setup(void * inContext) +int TestTLV_Setup(void * inContext) { CHIP_ERROR error = chip::Platform::MemoryInit(); if (error != CHIP_NO_ERROR) @@ -4491,25 +4491,25 @@ int TestCHIPTLV_Setup(void * inContext) /** * Tear down the test suite. */ -int TestCHIPTLV_Teardown(void * inContext) +int TestTLV_Teardown(void * inContext) { chip::Platform::MemoryShutdown(); return SUCCESS; } -int TestCHIPTLV() +int TestTLV() { // clang-format off nlTestSuite theSuite = { "chip-tlv", &sTests[0], - TestCHIPTLV_Setup, - TestCHIPTLV_Teardown + TestTLV_Setup, + TestTLV_Teardown }; // clang-format on return chip::ExecuteTestsWithContext(&theSuite, &theSuite); } -CHIP_REGISTER_TEST_SUITE(TestCHIPTLV) +CHIP_REGISTER_TEST_SUITE(TestTLV) diff --git a/src/lib/support/PersistentData.h b/src/lib/support/PersistentData.h index b1eceaf6a3bd4d..f2961c7a5427f0 100644 --- a/src/lib/support/PersistentData.h +++ b/src/lib/support/PersistentData.h @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include namespace chip { diff --git a/src/lib/support/jsontlv/TlvJson.h b/src/lib/support/jsontlv/TlvJson.h index 85e2ce259dbce2..12a64a38505db3 100644 --- a/src/lib/support/jsontlv/TlvJson.h +++ b/src/lib/support/jsontlv/TlvJson.h @@ -17,7 +17,7 @@ */ #include -#include +#include namespace chip { diff --git a/src/platform/ESP32/ESP32DeviceInfoProvider.cpp b/src/platform/ESP32/ESP32DeviceInfoProvider.cpp index b78e85c7db7335..bacae0f9449395 100644 --- a/src/platform/ESP32/ESP32DeviceInfoProvider.cpp +++ b/src/platform/ESP32/ESP32DeviceInfoProvider.cpp @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include #include #include #include diff --git a/src/platform/nxp/k32w/k32w0/K32W0FactoryDataProvider.cpp b/src/platform/nxp/k32w/k32w0/K32W0FactoryDataProvider.cpp index 91a37ad675b910..66a3f948532d46 100644 --- a/src/platform/nxp/k32w/k32w0/K32W0FactoryDataProvider.cpp +++ b/src/platform/nxp/k32w/k32w0/K32W0FactoryDataProvider.cpp @@ -25,7 +25,7 @@ #include "fsl_flash.h" #include #include -#include +#include #include #include diff --git a/src/platform/nxp/mw320/DeviceInfoProviderImpl.cpp b/src/platform/nxp/mw320/DeviceInfoProviderImpl.cpp index 2255d0d0e84bed..0c8731b6782e9f 100644 --- a/src/platform/nxp/mw320/DeviceInfoProviderImpl.cpp +++ b/src/platform/nxp/mw320/DeviceInfoProviderImpl.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include +#include #include #include #include diff --git a/src/platform/nxp/mw320/FactoryDataProvider.cpp b/src/platform/nxp/mw320/FactoryDataProvider.cpp index fd458221552360..20400b08f05534 100644 --- a/src/platform/nxp/mw320/FactoryDataProvider.cpp +++ b/src/platform/nxp/mw320/FactoryDataProvider.cpp @@ -19,7 +19,7 @@ #include "CHIPDevicePlatformConfig.h" #include #include -#include +#include #include #include diff --git a/src/platform/nxp/mw320/NetworkProvisioningServerImpl.cpp b/src/platform/nxp/mw320/NetworkProvisioningServerImpl.cpp index 936dad31fe8de5..c0ebecace60c8f 100644 --- a/src/platform/nxp/mw320/NetworkProvisioningServerImpl.cpp +++ b/src/platform/nxp/mw320/NetworkProvisioningServerImpl.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include namespace chip { diff --git a/src/platform/silabs/EFR32/Efr32PsaOperationalKeystore.cpp b/src/platform/silabs/EFR32/Efr32PsaOperationalKeystore.cpp index e8fdf61ff1c903..8cd1bef4189330 100644 --- a/src/platform/silabs/EFR32/Efr32PsaOperationalKeystore.cpp +++ b/src/platform/silabs/EFR32/Efr32PsaOperationalKeystore.cpp @@ -18,8 +18,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/protocols/bdx/tests/TestBdxTransferSession.cpp b/src/protocols/bdx/tests/TestBdxTransferSession.cpp index 0242b88daaebe6..e86f079aa0c285 100644 --- a/src/protocols/bdx/tests/TestBdxTransferSession.cpp +++ b/src/protocols/bdx/tests/TestBdxTransferSession.cpp @@ -6,7 +6,7 @@ #include -#include +#include #include #include #include @@ -28,7 +28,7 @@ const TLV::Tag tlvListTag = TLV::ProfileTag(7777, 8888); } // anonymous namespace // Helper method for generating a complete TLV structure with a list containing a single tag and string -CHIP_ERROR WriteChipTLVString(uint8_t * buf, uint32_t bufLen, const char * data, uint32_t & written) +CHIP_ERROR WriteTLVString(uint8_t * buf, uint32_t bufLen, const char * data, uint32_t & written) { written = 0; TLV::TLVWriter writer; @@ -387,7 +387,7 @@ void TestInitiatingReceiverReceiverDrive(nlTestSuite * inSuite, void * inContext uint8_t tlvBuf[64] = { 0 }; char metadataStr[11] = { "hi_dad.txt" }; uint32_t bytesWritten = 0; - err = WriteChipTLVString(tlvBuf, sizeof(tlvBuf), metadataStr, bytesWritten); + err = WriteTLVString(tlvBuf, sizeof(tlvBuf), metadataStr, bytesWritten); NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); uint16_t metadataSize = static_cast(bytesWritten & 0x0000FFFF); @@ -474,7 +474,7 @@ void TestInitiatingSenderSenderDrive(nlTestSuite * inSuite, void * inContext) uint8_t tlvBuf[64] = { 0 }; char metadataStr[11] = { "hi_dad.txt" }; uint32_t bytesWritten = 0; - err = WriteChipTLVString(tlvBuf, sizeof(tlvBuf), metadataStr, bytesWritten); + err = WriteTLVString(tlvBuf, sizeof(tlvBuf), metadataStr, bytesWritten); NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR); uint16_t metadataSize = static_cast(bytesWritten & 0x0000FFFF); diff --git a/src/protocols/secure_channel/CASESession.h b/src/protocols/secure_channel/CASESession.h index e48f48bc6e946b..ff5248eb705e0c 100644 --- a/src/protocols/secure_channel/CASESession.h +++ b/src/protocols/secure_channel/CASESession.h @@ -30,8 +30,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/protocols/secure_channel/PairingSession.cpp b/src/protocols/secure_channel/PairingSession.cpp index b098e17f3c410a..ef38eb37ba5f80 100644 --- a/src/protocols/secure_channel/PairingSession.cpp +++ b/src/protocols/secure_channel/PairingSession.cpp @@ -18,7 +18,7 @@ #include -#include +#include #include namespace chip { diff --git a/src/protocols/secure_channel/PairingSession.h b/src/protocols/secure_channel/PairingSession.h index 37c419cbcee0d7..6e59f06dcaa660 100644 --- a/src/protocols/secure_channel/PairingSession.h +++ b/src/protocols/secure_channel/PairingSession.h @@ -26,7 +26,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/protocols/secure_channel/SimpleSessionResumptionStorage.h b/src/protocols/secure_channel/SimpleSessionResumptionStorage.h index ee2a98ee0b0c43..9a0aacdd4bd18e 100644 --- a/src/protocols/secure_channel/SimpleSessionResumptionStorage.h +++ b/src/protocols/secure_channel/SimpleSessionResumptionStorage.h @@ -24,7 +24,7 @@ #pragma once -#include +#include #include #include diff --git a/src/setup_payload/AdditionalDataPayloadGenerator.cpp b/src/setup_payload/AdditionalDataPayloadGenerator.cpp index f223d1df4b9e3a..c2888bfa1c6919 100644 --- a/src/setup_payload/AdditionalDataPayloadGenerator.cpp +++ b/src/setup_payload/AdditionalDataPayloadGenerator.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/setup_payload/AdditionalDataPayloadParser.cpp b/src/setup_payload/AdditionalDataPayloadParser.cpp index 09447114058277..eb6b48f1b0fcc1 100644 --- a/src/setup_payload/AdditionalDataPayloadParser.cpp +++ b/src/setup_payload/AdditionalDataPayloadParser.cpp @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/setup_payload/QRCodeSetupPayloadGenerator.cpp b/src/setup_payload/QRCodeSetupPayloadGenerator.cpp index 386000ba452a35..42a5374787d2d9 100644 --- a/src/setup_payload/QRCodeSetupPayloadGenerator.cpp +++ b/src/setup_payload/QRCodeSetupPayloadGenerator.cpp @@ -26,10 +26,10 @@ #include "Base38Encode.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/setup_payload/QRCodeSetupPayloadParser.cpp b/src/setup_payload/QRCodeSetupPayloadParser.cpp index 98a658be077eb9..93e560aff27215 100644 --- a/src/setup_payload/QRCodeSetupPayloadParser.cpp +++ b/src/setup_payload/QRCodeSetupPayloadParser.cpp @@ -30,8 +30,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/setup_payload/QRCodeSetupPayloadParser.h b/src/setup_payload/QRCodeSetupPayloadParser.h index 036776f229e4d7..adba3c93483c1b 100644 --- a/src/setup_payload/QRCodeSetupPayloadParser.h +++ b/src/setup_payload/QRCodeSetupPayloadParser.h @@ -26,7 +26,7 @@ #include "SetupPayload.h" #include -#include +#include #include #include diff --git a/src/setup_payload/SetupPayload.cpp b/src/setup_payload/SetupPayload.cpp index 70b5967d37cbcc..3b427f3b312473 100644 --- a/src/setup_payload/SetupPayload.cpp +++ b/src/setup_payload/SetupPayload.cpp @@ -24,10 +24,10 @@ #include "SetupPayload.h" #include -#include -#include -#include #include +#include +#include +#include #include #include diff --git a/src/system/SystemPacketBuffer.h b/src/system/SystemPacketBuffer.h index 2e8b3635b823d0..6be8a0a2725ded 100644 --- a/src/system/SystemPacketBuffer.h +++ b/src/system/SystemPacketBuffer.h @@ -90,8 +90,8 @@ struct pbuf * PacketBuffer objects may be chained to accommodate larger payloads. Chaining, however, is not transparent, and users of the * class must explicitly decide to support chaining. Examples of classes written with chaining support are as follows: * - * @ref chip::chipTLVReader - * @ref chip::chipTLVWriter + * @ref chip::TLVReader + * @ref chip::TLVWriter * * ### PacketBuffer format * diff --git a/src/system/TLVPacketBufferBackingStore.h b/src/system/TLVPacketBufferBackingStore.h index bbdb85e89df894..81afe973ad3c33 100644 --- a/src/system/TLVPacketBufferBackingStore.h +++ b/src/system/TLVPacketBufferBackingStore.h @@ -23,7 +23,7 @@ #pragma once -#include +#include #include #include diff --git a/src/tools/chip-cert/CertUtils.cpp b/src/tools/chip-cert/CertUtils.cpp index 28b6e0d3951131..2fece459ac4495 100644 --- a/src/tools/chip-cert/CertUtils.cpp +++ b/src/tools/chip-cert/CertUtils.cpp @@ -990,10 +990,9 @@ bool MakeCert(uint8_t certType, const ToolChipDN * subjectDN, X509 * caCert, EVP return res; } -CHIP_ERROR MakeCertChipTLV(uint8_t certType, const ToolChipDN * subjectDN, X509 * caCert, EVP_PKEY * caKey, - const struct tm & validFrom, uint32_t validDays, int pathLen, const FutureExtensionWithNID * futureExts, - uint8_t futureExtsCount, X509 * x509Cert, EVP_PKEY * newKey, CertStructConfig & certConfig, - MutableByteSpan & chipCert) +CHIP_ERROR MakeCertTLV(uint8_t certType, const ToolChipDN * subjectDN, X509 * caCert, EVP_PKEY * caKey, const struct tm & validFrom, + uint32_t validDays, int pathLen, const FutureExtensionWithNID * futureExts, uint8_t futureExtsCount, + X509 * x509Cert, EVP_PKEY * newKey, CertStructConfig & certConfig, MutableByteSpan & chipCert) { TLVWriter writer; TLVType containerType; diff --git a/src/tools/chip-cert/Cmd_GenCert.cpp b/src/tools/chip-cert/Cmd_GenCert.cpp index 07317d414c673f..5313b866e0d6dd 100644 --- a/src/tools/chip-cert/Cmd_GenCert.cpp +++ b/src/tools/chip-cert/Cmd_GenCert.cpp @@ -1181,8 +1181,8 @@ bool Cmd_GenCert(int argc, char * argv[]) uint32_t chipCertBufLen = kMaxCHIPCertLength + gCertConfig.GetExtraCertLength(); std::unique_ptr chipCertBuf = std::unique_ptr(new uint8_t[chipCertBufLen]); chip::MutableByteSpan chipCert(chipCertBuf.get(), chipCertBufLen); - err = MakeCertChipTLV(gCertType, &gSubjectDN, caCertPtr, caKeyPtr, gValidFrom, gValidDays, gPathLengthConstraint, - gFutureExtensions, gFutureExtensionsCount, newCert.get(), newKey.get(), gCertConfig, chipCert); + err = MakeCertTLV(gCertType, &gSubjectDN, caCertPtr, caKeyPtr, gValidFrom, gValidDays, gPathLengthConstraint, + gFutureExtensions, gFutureExtensionsCount, newCert.get(), newKey.get(), gCertConfig, chipCert); VerifyTrueOrExit(err == CHIP_NO_ERROR); res = WriteChipCert(gOutCertFileName, chipCert, gOutCertFormat); diff --git a/src/tools/chip-cert/Cmd_PrintCD.cpp b/src/tools/chip-cert/Cmd_PrintCD.cpp index f5eca4c4c47c70..bdb511850ac7cc 100644 --- a/src/tools/chip-cert/Cmd_PrintCD.cpp +++ b/src/tools/chip-cert/Cmd_PrintCD.cpp @@ -26,7 +26,7 @@ #include "chip-cert.h" #include -#include +#include #include namespace { diff --git a/src/tools/chip-cert/chip-cert.h b/src/tools/chip-cert/chip-cert.h index b8ea4a4a51a452..1c0e4a2b1d90d9 100644 --- a/src/tools/chip-cert/chip-cert.h +++ b/src/tools/chip-cert/chip-cert.h @@ -429,10 +429,10 @@ extern bool WriteChipCert(const char * fileName, const chip::ByteSpan & cert, Ce extern bool MakeCert(uint8_t certType, const ToolChipDN * subjectDN, X509 * caCert, EVP_PKEY * caKey, const struct tm & validFrom, uint32_t validDays, int pathLen, const FutureExtensionWithNID * futureExts, uint8_t futureExtsCount, X509 * newCert, EVP_PKEY * newKey, CertStructConfig & certConfig); -extern CHIP_ERROR MakeCertChipTLV(uint8_t certType, const ToolChipDN * subjectDN, X509 * caCert, EVP_PKEY * caKey, - const struct tm & validFrom, uint32_t validDays, int pathLen, - const FutureExtensionWithNID * futureExts, uint8_t futureExtsCount, X509 * x509Cert, - EVP_PKEY * newKey, CertStructConfig & certConfig, chip::MutableByteSpan & chipCert); +extern CHIP_ERROR MakeCertTLV(uint8_t certType, const ToolChipDN * subjectDN, X509 * caCert, EVP_PKEY * caKey, + const struct tm & validFrom, uint32_t validDays, int pathLen, + const FutureExtensionWithNID * futureExts, uint8_t futureExtsCount, X509 * x509Cert, + EVP_PKEY * newKey, CertStructConfig & certConfig, chip::MutableByteSpan & chipCert); extern bool ResignCert(X509 * cert, X509 * caCert, EVP_PKEY * caKey); extern bool MakeAttCert(AttCertType attCertType, const char * subjectCN, uint16_t subjectVID, uint16_t subjectPID,