Skip to content

Commit 9dee693

Browse files
bzbarsky-applebzbarsky-apple
authored
Split out CHIPErrror into a separate source set. (#29494)
* Split out CHIPErrror into a separate source set. CHIPError.cpp uses ErrorStr.h, so ErrorStr gets moved into the same source set. ErrorStr.cpp did not actually use CodeUtils.h for anything except including ErrorStr.h. The random whitespace changes are because we changed our clang-format version but then did not restyle the tree. * Address review comment.
1 parent 4263ced commit 9dee693

File tree

115 files changed

+161
-148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+161
-148
lines changed

‎examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
#include "CHIPDeviceManager.h"
2929
#include <app/ConcreteAttributePath.h>
3030
#include <app/util/basic-types.h>
31+
#include <core/ErrorStr.h>
3132
#include <credentials/DeviceAttestationCredsProvider.h>
3233
#include <credentials/examples/DeviceAttestationCredsExample.h>
3334
#include <platform/Ameba/FactoryDataProvider.h>
3435
#include <support/CHIPMem.h>
3536
#include <support/CodeUtils.h>
36-
#include <support/ErrorStr.h>
3737

3838
using namespace ::chip;
3939
using namespace ::chip::Credentials;

‎examples/all-clusters-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <app/server/OnboardingCodesUtil.h>
3232
#include <app/server/Server.h>
3333
#include <app/util/af.h>
34-
#include <lib/support/ErrorStr.h>
34+
#include <lib/core/ErrorStr.h>
3535
#include <platform/Ameba/AmebaConfig.h>
3636
#include <platform/Ameba/NetworkCommissioningDriver.h>
3737
#include <platform/CHIPDeviceLayer.h>

‎examples/all-clusters-minimal-app/ameba/main/CHIPDeviceManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#include "CHIPDeviceManager.h"
2929
#include <app/ConcreteAttributePath.h>
3030
#include <app/util/basic-types.h>
31+
#include <core/ErrorStr.h>
3132
#include <support/CHIPMem.h>
3233
#include <support/CodeUtils.h>
33-
#include <support/ErrorStr.h>
3434

3535
using namespace ::chip;
3636

‎examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <app/util/af.h>
3232
#include <credentials/DeviceAttestationCredsProvider.h>
3333
#include <credentials/examples/DeviceAttestationCredsExample.h>
34-
#include <lib/support/ErrorStr.h>
34+
#include <lib/core/ErrorStr.h>
3535
#include <platform/Ameba/AmebaConfig.h>
3636
#include <platform/Ameba/NetworkCommissioningDriver.h>
3737
#include <platform/CHIPDeviceLayer.h>

‎examples/bridge-app/asr/subdevice/SubDeviceManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
#include <app/util/attribute-storage.h>
3030
#include <assert.h>
3131
#include <lib/core/CHIPError.h>
32+
#include <lib/core/ErrorStr.h>
3233
#include <lib/support/CHIPMem.h>
3334
#include <lib/support/CHIPMemString.h>
34-
#include <lib/support/ErrorStr.h>
3535
#include <lib/support/ZclString.h>
3636
#include <platform/CHIPDeviceLayer.h>
3737

‎examples/bridge-app/asr/subdevice/SubDeviceManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
#include <app/util/attribute-storage.h>
3030
#include <assert.h>
3131
#include <lib/core/CHIPError.h>
32+
#include <lib/core/ErrorStr.h>
3233
#include <lib/support/CHIPMem.h>
3334
#include <lib/support/CHIPMemString.h>
34-
#include <lib/support/ErrorStr.h>
3535
#include <lib/support/ZclString.h>
3636
#include <platform/CHIPDeviceLayer.h>
3737

‎examples/bridge-app/asr/subdevice/subdevice_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
#include <app/util/attribute-storage.h>
3030
#include <assert.h>
3131
#include <lib/core/CHIPError.h>
32+
#include <lib/core/ErrorStr.h>
3233
#include <lib/support/CHIPMem.h>
3334
#include <lib/support/CHIPMemString.h>
34-
#include <lib/support/ErrorStr.h>
3535
#include <lib/support/ZclString.h>
3636
#include <platform/CHIPDeviceLayer.h>
3737

‎examples/chef/ameba/main/CHIPDeviceManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#include "CHIPDeviceManager.h"
2929
#include <app/ConcreteAttributePath.h>
3030
#include <app/util/basic-types.h>
31+
#include <core/ErrorStr.h>
3132
#include <support/CHIPMem.h>
3233
#include <support/CodeUtils.h>
33-
#include <support/ErrorStr.h>
3434

3535
using namespace ::chip;
3636

‎examples/chef/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <app/util/af.h>
3333
#include <credentials/DeviceAttestationCredsProvider.h>
3434
#include <credentials/examples/DeviceAttestationCredsExample.h>
35-
#include <lib/support/ErrorStr.h>
35+
#include <lib/core/ErrorStr.h>
3636
#include <platform/Ameba/AmebaConfig.h>
3737
#include <platform/Ameba/FactoryDataProvider.h>
3838
#include <platform/Ameba/NetworkCommissioningDriver.h>

‎examples/contact-sensor-app/nxp/k32w/k32w0/main/AppTask.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "AppEvent.h"
2121
#include <app/server/OnboardingCodesUtil.h>
2222
#include <app/server/Server.h>
23-
#include <lib/support/ErrorStr.h>
23+
#include <lib/core/ErrorStr.h>
2424

2525
#include <DeviceInfoProviderImpl.h>
2626
#include <app/server/OnboardingCodesUtil.h>
@@ -425,7 +425,7 @@ void AppTask::ButtonEventHandler(uint8_t pin_no, uint8_t button_action)
425425

426426
void AppTask::KBD_Callback(uint8_t events)
427427
{
428-
eventMask = eventMask | (uint32_t)(1 << events);
428+
eventMask = eventMask | (uint32_t) (1 << events);
429429

430430
HandleKeyboard();
431431
}

‎examples/light-switch-app/ameba/main/CHIPDeviceManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
#include "CHIPDeviceManager.h"
2929
#include <app/ConcreteAttributePath.h>
3030
#include <app/util/basic-types.h>
31+
#include <core/ErrorStr.h>
3132
#include <credentials/DeviceAttestationCredsProvider.h>
3233
#include <credentials/examples/DeviceAttestationCredsExample.h>
3334
#include <platform/Ameba/FactoryDataProvider.h>
3435
#include <support/CHIPMem.h>
3536
#include <support/CodeUtils.h>
36-
#include <support/ErrorStr.h>
3737

3838
using namespace ::chip;
3939
using namespace ::chip::Credentials;

‎examples/light-switch-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <app/server/OnboardingCodesUtil.h>
3232
#include <app/server/Server.h>
3333
#include <app/util/af.h>
34-
#include <lib/support/ErrorStr.h>
34+
#include <lib/core/ErrorStr.h>
3535
#include <platform/Ameba/AmebaConfig.h>
3636
#include <platform/Ameba/NetworkCommissioningDriver.h>
3737
#include <platform/CHIPDeviceLayer.h>

‎examples/lighting-app/ameba/main/CHIPDeviceManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626

2727
#include "CHIPDeviceManager.h"
2828
#include <app/util/basic-types.h>
29+
#include <core/ErrorStr.h>
2930
#include <credentials/DeviceAttestationCredsProvider.h>
3031
#include <credentials/examples/DeviceAttestationCredsExample.h>
3132
#include <platform/Ameba/FactoryDataProvider.h>
3233
#include <support/CHIPMem.h>
3334
#include <support/CodeUtils.h>
34-
#include <support/ErrorStr.h>
3535

3636
#include "Globals.h"
3737
#include "LEDWidget.h"

‎examples/lighting-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <app/clusters/network-commissioning/network-commissioning.h>
3333
#include <app/server/OnboardingCodesUtil.h>
3434
#include <app/util/af.h>
35-
#include <lib/support/ErrorStr.h>
35+
#include <lib/core/ErrorStr.h>
3636
#include <platform/Ameba/AmebaConfig.h>
3737
#include <platform/Ameba/NetworkCommissioningDriver.h>
3838
#include <platform/CHIPDeviceLayer.h>

‎examples/lighting-app/beken/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <app/clusters/identify-server/identify-server.h>
3030
#include <app/clusters/network-commissioning/network-commissioning.h>
3131
#include <app/server/OnboardingCodesUtil.h>
32-
#include <lib/support/ErrorStr.h>
32+
#include <lib/core/ErrorStr.h>
3333
#include <platform/Beken/BekenConfig.h>
3434
#include <platform/Beken/NetworkCommissioningDriver.h>
3535
#include <setup_payload/ManualSetupPayloadGenerator.h>

‎examples/lighting-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
#include <app/server/Server.h>
3434
#include <credentials/DeviceAttestationCredsProvider.h>
3535
#include <credentials/examples/DeviceAttestationCredsExample.h>
36+
#include <lib/core/ErrorStr.h>
3637
#include <lib/support/CHIPMem.h>
3738
#include <lib/support/CodeUtils.h>
38-
#include <lib/support/ErrorStr.h>
3939
#include <system/SystemClock.h>
4040

4141
#ifdef CONFIG_CHIP_WIFI

‎examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "AppEvent.h"
2121
#include <app/server/OnboardingCodesUtil.h>
2222
#include <app/server/Server.h>
23-
#include <lib/support/ErrorStr.h>
23+
#include <lib/core/ErrorStr.h>
2424

2525
#include <app/server/OnboardingCodesUtil.h>
2626
#include <credentials/DeviceAttestationCredsProvider.h>
@@ -427,7 +427,7 @@ void AppTask::ButtonEventHandler(uint8_t pin_no, uint8_t button_action)
427427

428428
void AppTask::KBD_Callback(uint8_t events)
429429
{
430-
eventMask = eventMask | (uint32_t)(1 << events);
430+
eventMask = eventMask | (uint32_t) (1 << events);
431431
}
432432

433433
void AppTask::HandleKeyboard(void)

‎examples/lock-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
#include <app/server/Server.h>
3232
#include <credentials/DeviceAttestationCredsProvider.h>
3333
#include <credentials/examples/DeviceAttestationCredsExample.h>
34+
#include <lib/core/ErrorStr.h>
3435
#include <lib/support/CHIPMem.h>
3536
#include <lib/support/CodeUtils.h>
36-
#include <lib/support/ErrorStr.h>
3737
#include <system/SystemClock.h>
3838

3939
#ifdef CONFIG_CHIP_WIFI

‎examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "AppEvent.h"
2121
#include <app/server/OnboardingCodesUtil.h>
2222
#include <app/server/Server.h>
23-
#include <lib/support/ErrorStr.h>
23+
#include <lib/core/ErrorStr.h>
2424

2525
#include <DeviceInfoProviderImpl.h>
2626
#include <app/server/OnboardingCodesUtil.h>
@@ -323,7 +323,7 @@ void AppTask::ButtonEventHandler(uint8_t pin_no, uint8_t button_action)
323323

324324
void AppTask::KBD_Callback(uint8_t events)
325325
{
326-
eventMask = eventMask | (uint32_t)(1 << events);
326+
eventMask = eventMask | (uint32_t) (1 << events);
327327

328328
HandleKeyboard();
329329
}

‎examples/ota-requestor-app/ameba/main/CHIPDeviceManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
#include "CHIPDeviceManager.h"
2929
#include <app/ConcreteAttributePath.h>
3030
#include <app/util/basic-types.h>
31+
#include <core/ErrorStr.h>
3132
#include <credentials/DeviceAttestationCredsProvider.h>
3233
#include <credentials/examples/DeviceAttestationCredsExample.h>
3334
#include <platform/Ameba/FactoryDataProvider.h>
3435
#include <support/CHIPMem.h>
3536
#include <support/CodeUtils.h>
36-
#include <support/ErrorStr.h>
3737

3838
using namespace ::chip;
3939
using namespace ::chip::Credentials;

‎examples/ota-requestor-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <app/server/Server.h>
2727
#include <app/util/af.h>
2828

29-
#include <lib/support/ErrorStr.h>
29+
#include <lib/core/ErrorStr.h>
3030
#include <platform/Ameba/AmebaConfig.h>
3131
#include <platform/Ameba/NetworkCommissioningDriver.h>
3232
#include <platform/CHIPDeviceLayer.h>

‎examples/persistent-storage/KeyValueStorageTest.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include <cstring>
2222
#include <string>
2323

24+
#include <lib/core/ErrorStr.h>
2425
#include <lib/support/CodeUtils.h>
25-
#include <lib/support/ErrorStr.h>
2626
#include <lib/support/logging/CHIPLogging.h>
2727
#include <platform/KeyValueStoreManager.h>
2828

‎examples/persistent-storage/esp32/main/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "freertos/FreeRTOS.h"
2121
#include "freertos/task.h"
2222
#include "nvs_flash.h"
23-
#include <lib/support/ErrorStr.h>
23+
#include <lib/core/ErrorStr.h>
2424
#include <platform/KeyValueStoreManager.h>
2525

2626
const char * TAG = "persistent-storage";

‎examples/platform/asr/CHIPDeviceManager.cpp

100755100644
+1-1
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#include <app/ConcreteAttributePath.h>
2929
#include <app/util/basic-types.h>
3030
#include <app/util/config.h>
31+
#include <core/ErrorStr.h>
3132
#include <support/CHIPMem.h>
3233
#include <support/CodeUtils.h>
33-
#include <support/ErrorStr.h>
3434

3535
#ifdef EMBER_AF_PLUGIN_IDENTIFY_SERVER
3636
#include <app/clusters/identify-server/identify-server.h>

‎examples/platform/beken/common/CHIPDeviceManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
#include "CHIPDeviceManager.h"
2828
#include <app/ConcreteAttributePath.h>
2929
#include <app/util/basic-types.h>
30+
#include <lib/core/ErrorStr.h>
3031
#include <lib/support/CHIPMem.h>
3132
#include <lib/support/CodeUtils.h>
32-
#include <lib/support/ErrorStr.h>
3333
#include <setup_payload/SetupPayload.h>
3434

3535
using namespace ::chip;

‎examples/platform/esp32/common/CHIPDeviceManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
#include "CHIPDeviceManager.h"
2828
#include <app/ConcreteAttributePath.h>
2929
#include <app/util/basic-types.h>
30+
#include <lib/core/ErrorStr.h>
3031
#include <lib/support/CHIPMem.h>
3132
#include <lib/support/CodeUtils.h>
32-
#include <lib/support/ErrorStr.h>
3333
#include <setup_payload/SetupPayload.h>
3434

3535
#include "esp_log.h"

‎examples/platform/nrfconnect/util/test/TestInetCommon.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
#include <string.h>
4444
#include <sys/types.h>
4545

46+
#include <lib/core/ErrorStr.h>
4647
#include <lib/support/CHIPMem.h>
47-
#include <lib/support/ErrorStr.h>
4848
#include <lib/support/ScopedBuffer.h>
4949

5050
#if CHIP_SYSTEM_CONFIG_USE_SOCKETS

‎examples/pump-app/cc13x2x7_26x2x7/main/CHIPDeviceManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929

3030
#include <app/ConcreteAttributePath.h>
3131
#include <app/util/basic-types.h>
32+
#include <lib/core/ErrorStr.h>
3233
#include <lib/support/CHIPMem.h>
3334
#include <lib/support/CodeUtils.h>
34-
#include <lib/support/ErrorStr.h>
3535
#include <setup_payload/SetupPayload.h>
3636

3737
using namespace ::chip;

‎examples/pump-app/cc13x4_26x4/main/CHIPDeviceManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929

3030
#include <app/ConcreteAttributePath.h>
3131
#include <app/util/basic-types.h>
32+
#include <lib/core/ErrorStr.h>
3233
#include <lib/support/CHIPMem.h>
3334
#include <lib/support/CodeUtils.h>
34-
#include <lib/support/ErrorStr.h>
3535
#include <setup_payload/SetupPayload.h>
3636

3737
using namespace ::chip;

‎examples/pump-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#include <app/util/attribute-storage.h>
3131
#include <credentials/DeviceAttestationCredsProvider.h>
3232
#include <credentials/examples/DeviceAttestationCredsExample.h>
33+
#include <lib/core/ErrorStr.h>
3334
#include <lib/support/CHIPMem.h>
3435
#include <lib/support/CodeUtils.h>
35-
#include <lib/support/ErrorStr.h>
3636
#include <system/SystemClock.h>
3737

3838
#if CONFIG_CHIP_OTA_REQUESTOR

‎examples/pump-controller-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#include <app/util/attribute-storage.h>
3131
#include <credentials/DeviceAttestationCredsProvider.h>
3232
#include <credentials/examples/DeviceAttestationCredsExample.h>
33+
#include <lib/core/ErrorStr.h>
3334
#include <lib/support/CHIPMem.h>
3435
#include <lib/support/CodeUtils.h>
35-
#include <lib/support/ErrorStr.h>
3636
#include <system/SystemClock.h>
3737

3838
#if CONFIG_CHIP_OTA_REQUESTOR

‎examples/shell/cc13x2x7_26x2x7/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include "AppTask.h"
2121
#include <app/server/Server.h>
22-
#include <lib/support/ErrorStr.h>
22+
#include <lib/core/ErrorStr.h>
2323

2424
#include "FreeRTOS.h"
2525

‎examples/shell/cc13x4_26x4/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "AppTask.h"
2020
#include <app/server/Server.h>
21-
#include <lib/support/ErrorStr.h>
21+
#include <lib/core/ErrorStr.h>
2222

2323
#include "FreeRTOS.h"
2424

‎examples/shell/nxp/k32w/k32w0/main/AppTask.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "AppTask.h"
2020
#include "AppEvent.h"
2121
#include <app/server/Server.h>
22-
#include <lib/support/ErrorStr.h>
22+
#include <lib/core/ErrorStr.h>
2323

2424
#include <app/server/OnboardingCodesUtil.h>
2525
#include <credentials/DeviceAttestationCredsProvider.h>
@@ -246,7 +246,7 @@ void AppTask::ButtonEventHandler(uint8_t pin_no, uint8_t button_action)
246246

247247
void AppTask::KBD_Callback(uint8_t events)
248248
{
249-
eventMask = eventMask | (uint32_t)(1 << events);
249+
eventMask = eventMask | (uint32_t) (1 << events);
250250

251251
HandleKeyboard();
252252
}

0 commit comments

Comments
 (0)