Skip to content

Commit 1390774

Browse files
Damian-Nordicpull[bot]
Damian-Nordic
authored and
pull[bot]
committed
[logging] Use CHIP_ERROR_FORMAT in more places (#19983)
We have two alternative ways of logging an error code: - using CHIP_ERROR_FORMAT which resolves either to %s or %u - using %s + ErrorStr() Both methods are supposed to have the same effect, but the former generates slightly smaller code. Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
1 parent 63bd294 commit 1390774

38 files changed

+90
-95
lines changed

‎src/app/DeviceProxy.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include <lib/core/CHIPEncoding.h>
3333
#include <lib/dnssd/Resolver.h>
3434
#include <lib/support/CodeUtils.h>
35-
#include <lib/support/ErrorStr.h>
3635
#include <lib/support/logging/CHIPLogging.h>
3736

3837
using namespace chip::Callback;

‎src/app/EventManagement.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <lib/core/CHIPEventLoggingConfig.h>
2828
#include <lib/core/CHIPTLVUtilities.hpp>
2929
#include <lib/support/CodeUtils.h>
30-
#include <lib/support/ErrorStr.h>
3130
#include <lib/support/logging/CHIPLogging.h>
3231

3332
using namespace chip::TLV;
@@ -468,7 +467,7 @@ CHIP_ERROR EventManagement::LogEventPrivate(EventLoggingDelegate * apDelegate, c
468467
exit:
469468
if (err != CHIP_NO_ERROR)
470469
{
471-
ChipLogError(EventLogging, "Log event with error %s", ErrorStr(err));
470+
ChipLogError(EventLogging, "Log event with error %" CHIP_ERROR_FORMAT, err.Format());
472471
writer = checkpoint;
473472
}
474473
else if (opts.mPriority >= CHIP_CONFIG_EVENT_GLOBAL_PRIORITY)

‎src/app/MessageDef/StatusIB.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
#include <app/AppBuildConfig.h>
3333
#include <lib/core/CHIPCore.h>
34-
#include <lib/support/ErrorStr.h>
3534

3635
using namespace chip;
3736
using namespace chip::TLV;

‎src/app/OperationalDeviceProxy.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include <lib/core/CHIPEncoding.h>
3737
#include <lib/dnssd/Resolver.h>
3838
#include <lib/support/CodeUtils.h>
39-
#include <lib/support/ErrorStr.h>
4039
#include <lib/support/logging/CHIPLogging.h>
4140
#include <system/SystemLayer.h>
4241

‎src/app/WriteClient.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ CHIP_ERROR WriteClient::SendWriteRequest(const SessionHandle & session, System::
394394
exit:
395395
if (err != CHIP_NO_ERROR)
396396
{
397-
ChipLogError(DataManagement, "Write client failed to SendWriteRequest: %s", ErrorStr(err));
397+
ChipLogError(DataManagement, "Write client failed to SendWriteRequest: %" CHIP_ERROR_FORMAT, err.Format());
398398
}
399399
else
400400
{

‎src/app/server/CommissioningWindowManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void CommissioningWindowManager::OnSessionEstablishmentError(CHIP_ERROR err)
115115
void CommissioningWindowManager::HandleFailedAttempt(CHIP_ERROR err)
116116
{
117117
mFailedCommissioningAttempts++;
118-
ChipLogError(AppServer, "Commissioning failed (attempt %d): %s", mFailedCommissioningAttempts, ErrorStr(err));
118+
ChipLogError(AppServer, "Commissioning failed (attempt %d): %" CHIP_ERROR_FORMAT, mFailedCommissioningAttempts, err.Format());
119119
#if CONFIG_NETWORK_LAYER_BLE
120120
mServer->GetBleLayerObject()->CloseAllBleConnections();
121121
#endif

‎src/app/server/Dnssd.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -132,35 +132,35 @@ bool DnssdServer::OnExpiration(System::Clock::Timestamp expirationMs)
132132
CHIP_ERROR err = Dnssd::ServiceAdvertiser::Instance().Init(chip::DeviceLayer::UDPEndPointManager());
133133
if (err != CHIP_NO_ERROR)
134134
{
135-
ChipLogError(Discovery, "Failed to initialize advertiser: %s", chip::ErrorStr(err));
135+
ChipLogError(Discovery, "Failed to initialize advertiser: %" CHIP_ERROR_FORMAT, err.Format());
136136
}
137137

138138
// reset advertising
139139
err = Dnssd::ServiceAdvertiser::Instance().RemoveServices();
140140
if (err != CHIP_NO_ERROR)
141141
{
142-
ChipLogError(Discovery, "Failed to remove advertised services: %s", chip::ErrorStr(err));
142+
ChipLogError(Discovery, "Failed to remove advertised services: %" CHIP_ERROR_FORMAT, err.Format());
143143
}
144144

145145
// restart operational (if needed)
146146
err = AdvertiseOperational();
147147
if (err != CHIP_NO_ERROR)
148148
{
149-
ChipLogError(Discovery, "Failed to advertise operational node: %s", chip::ErrorStr(err));
149+
ChipLogError(Discovery, "Failed to advertise operational node: %" CHIP_ERROR_FORMAT, err.Format());
150150
}
151151

152152
#if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY
153153
err = AdvertiseCommissioner();
154154
if (err != CHIP_NO_ERROR)
155155
{
156-
ChipLogError(Discovery, "Failed to advertise commissioner: %s", chip::ErrorStr(err));
156+
ChipLogError(Discovery, "Failed to advertise commissioner: %" CHIP_ERROR_FORMAT, err.Format());
157157
}
158158
#endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY
159159

160160
err = Dnssd::ServiceAdvertiser::Instance().FinalizeServiceUpdate();
161161
if (err != CHIP_NO_ERROR)
162162
{
163-
ChipLogError(Discovery, "Failed to finalize service update: %s", chip::ErrorStr(err));
163+
ChipLogError(Discovery, "Failed to finalize service update: %" CHIP_ERROR_FORMAT, err.Format());
164164
}
165165

166166
return true;
@@ -183,7 +183,7 @@ void DnssdServer::OnDiscoveryExpiration(System::Layer * aSystemLayer, void * aAp
183183
CHIP_ERROR err = AdvertiseCommissionableNode(chip::Dnssd::CommissioningMode::kDisabled);
184184
if (err != CHIP_NO_ERROR)
185185
{
186-
ChipLogError(Discovery, "Failed to advertise extended commissionable node: %s", chip::ErrorStr(err));
186+
ChipLogError(Discovery, "Failed to advertise extended commissionable node: %" CHIP_ERROR_FORMAT, err.Format());
187187
}
188188
// set timeout
189189
ScheduleExtendedDiscoveryExpiration();
@@ -433,27 +433,27 @@ void DnssdServer::StartServer(Dnssd::CommissioningMode mode)
433433
CHIP_ERROR err = Dnssd::ServiceAdvertiser::Instance().Init(chip::DeviceLayer::UDPEndPointManager());
434434
if (err != CHIP_NO_ERROR)
435435
{
436-
ChipLogError(Discovery, "Failed to initialize advertiser: %s", chip::ErrorStr(err));
436+
ChipLogError(Discovery, "Failed to initialize advertiser: %" CHIP_ERROR_FORMAT, err.Format());
437437
}
438438

439439
err = Dnssd::ServiceAdvertiser::Instance().RemoveServices();
440440
if (err != CHIP_NO_ERROR)
441441
{
442-
ChipLogError(Discovery, "Failed to remove advertised services: %s", chip::ErrorStr(err));
442+
ChipLogError(Discovery, "Failed to remove advertised services: %" CHIP_ERROR_FORMAT, err.Format());
443443
}
444444

445445
err = AdvertiseOperational();
446446
if (err != CHIP_NO_ERROR)
447447
{
448-
ChipLogError(Discovery, "Failed to advertise operational node: %s", chip::ErrorStr(err));
448+
ChipLogError(Discovery, "Failed to advertise operational node: %" CHIP_ERROR_FORMAT, err.Format());
449449
}
450450

451451
if (mode != chip::Dnssd::CommissioningMode::kDisabled)
452452
{
453453
err = AdvertiseCommissionableNode(mode);
454454
if (err != CHIP_NO_ERROR)
455455
{
456-
ChipLogError(Discovery, "Failed to advertise commissionable node: %s", chip::ErrorStr(err));
456+
ChipLogError(Discovery, "Failed to advertise commissionable node: %" CHIP_ERROR_FORMAT, err.Format());
457457
}
458458

459459
// If any fabrics exist, the commissioning window must have been opened by the administrator
@@ -469,7 +469,7 @@ void DnssdServer::StartServer(Dnssd::CommissioningMode mode)
469469
err = AdvertiseCommissionableNode(mode);
470470
if (err != CHIP_NO_ERROR)
471471
{
472-
ChipLogError(Discovery, "Failed to advertise extended commissionable node: %s", chip::ErrorStr(err));
472+
ChipLogError(Discovery, "Failed to advertise extended commissionable node: %" CHIP_ERROR_FORMAT, err.Format());
473473
}
474474
// set timeout
475475
ScheduleExtendedDiscoveryExpiration();
@@ -480,14 +480,14 @@ void DnssdServer::StartServer(Dnssd::CommissioningMode mode)
480480
err = AdvertiseCommissioner();
481481
if (err != CHIP_NO_ERROR)
482482
{
483-
ChipLogError(Discovery, "Failed to advertise commissioner: %s", chip::ErrorStr(err));
483+
ChipLogError(Discovery, "Failed to advertise commissioner: %" CHIP_ERROR_FORMAT, err.Format());
484484
}
485485
#endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY
486486

487487
err = Dnssd::ServiceAdvertiser::Instance().FinalizeServiceUpdate();
488488
if (err != CHIP_NO_ERROR)
489489
{
490-
ChipLogError(Discovery, "Failed to finalize service update: %s", chip::ErrorStr(err));
490+
ChipLogError(Discovery, "Failed to finalize service update: %" CHIP_ERROR_FORMAT, err.Format());
491491
}
492492
}
493493

‎src/app/server/OnboardingCodesUtil.cpp

+10-9
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void PrintOnboardingCodes(chip::RendezvousInformationFlags aRendezvousFlags)
4343
CHIP_ERROR err = GetPayloadContents(payload, aRendezvousFlags);
4444
if (err != CHIP_NO_ERROR)
4545
{
46-
ChipLogError(AppServer, "GetPayloadContents() failed: %s", chip::ErrorStr(err));
46+
ChipLogError(AppServer, "GetPayloadContents() failed: %" CHIP_ERROR_FORMAT, err.Format());
4747
}
4848

4949
PrintOnboardingCodes(payload);
@@ -105,7 +105,7 @@ CHIP_ERROR GetPayloadContents(chip::PayloadContents & aPayload, chip::Rendezvous
105105
err = GetCommissionableDataProvider()->GetSetupPasscode(aPayload.setUpPINCode);
106106
if (err != CHIP_NO_ERROR)
107107
{
108-
ChipLogError(AppServer, "GetCommissionableDataProvider()->GetSetupPasscode() failed: %s", chip::ErrorStr(err));
108+
ChipLogError(AppServer, "GetCommissionableDataProvider()->GetSetupPasscode() failed: %" CHIP_ERROR_FORMAT, err.Format());
109109
#if defined(CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE) && CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE
110110
ChipLogProgress(AppServer, "*** Using default EXAMPLE passcode %u ***",
111111
static_cast<unsigned>(CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE));
@@ -118,21 +118,22 @@ CHIP_ERROR GetPayloadContents(chip::PayloadContents & aPayload, chip::Rendezvous
118118
err = GetCommissionableDataProvider()->GetSetupDiscriminator(aPayload.discriminator);
119119
if (err != CHIP_NO_ERROR)
120120
{
121-
ChipLogError(AppServer, "GetCommissionableDataProvider()->GetSetupDiscriminator() failed: %s", chip::ErrorStr(err));
121+
ChipLogError(AppServer, "GetCommissionableDataProvider()->GetSetupDiscriminator() failed: %" CHIP_ERROR_FORMAT,
122+
err.Format());
122123
return err;
123124
}
124125

125126
err = chip::DeviceLayer::GetDeviceInstanceInfoProvider()->GetVendorId(aPayload.vendorID);
126127
if (err != CHIP_NO_ERROR)
127128
{
128-
ChipLogError(AppServer, "GetDeviceInstanceInfoProvider()->GetVendorId() failed: %s", chip::ErrorStr(err));
129+
ChipLogError(AppServer, "GetDeviceInstanceInfoProvider()->GetVendorId() failed: %" CHIP_ERROR_FORMAT, err.Format());
129130
return err;
130131
}
131132

132133
err = chip::DeviceLayer::GetDeviceInstanceInfoProvider()->GetProductId(aPayload.productID);
133134
if (err != CHIP_NO_ERROR)
134135
{
135-
ChipLogError(AppServer, "GetDeviceInstanceInfoProvider()->GetProductId() failed: %s", chip::ErrorStr(err));
136+
ChipLogError(AppServer, "GetDeviceInstanceInfoProvider()->GetProductId() failed: %" CHIP_ERROR_FORMAT, err.Format());
136137
return err;
137138
}
138139

@@ -146,7 +147,7 @@ CHIP_ERROR GetQRCode(chip::MutableCharSpan & aQRCode, chip::RendezvousInformatio
146147
CHIP_ERROR err = GetPayloadContents(payload, aRendezvousFlags);
147148
if (err != CHIP_NO_ERROR)
148149
{
149-
ChipLogError(AppServer, "GetPayloadContents() failed: %s", chip::ErrorStr(err));
150+
ChipLogError(AppServer, "GetPayloadContents() failed: %" CHIP_ERROR_FORMAT, err.Format());
150151
return err;
151152
}
152153

@@ -158,7 +159,7 @@ CHIP_ERROR GetQRCode(chip::MutableCharSpan & aQRCode, const chip::PayloadContent
158159
CHIP_ERROR err = chip::QRCodeBasicSetupPayloadGenerator(payload).payloadBase38Representation(aQRCode);
159160
if (err != CHIP_NO_ERROR)
160161
{
161-
ChipLogError(AppServer, "Generating QR Code failed: %s", chip::ErrorStr(err));
162+
ChipLogError(AppServer, "Generating QR Code failed: %" CHIP_ERROR_FORMAT, err.Format());
162163
return err;
163164
}
164165

@@ -186,7 +187,7 @@ CHIP_ERROR GetManualPairingCode(chip::MutableCharSpan & aManualPairingCode, chip
186187
CHIP_ERROR err = GetPayloadContents(payload, aRendezvousFlags);
187188
if (err != CHIP_NO_ERROR)
188189
{
189-
ChipLogError(AppServer, "GetPayloadContents() failed: %s", chip::ErrorStr(err));
190+
ChipLogError(AppServer, "GetPayloadContents() failed: %" CHIP_ERROR_FORMAT, err.Format());
190191
return err;
191192
}
192193
return GetManualPairingCode(aManualPairingCode, payload);
@@ -197,7 +198,7 @@ CHIP_ERROR GetManualPairingCode(chip::MutableCharSpan & aManualPairingCode, cons
197198
CHIP_ERROR err = chip::ManualSetupPayloadGenerator(payload).payloadDecimalStringRepresentation(aManualPairingCode);
198199
if (err != CHIP_NO_ERROR)
199200
{
200-
ChipLogError(AppServer, "Generating Manual Pairing Code failed: %s", chip::ErrorStr(err));
201+
ChipLogError(AppServer, "Generating Manual Pairing Code failed: %" CHIP_ERROR_FORMAT, err.Format());
201202
return err;
202203
}
203204

‎src/app/server/Server.cpp

+3-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include <lib/dnssd/ServiceNaming.h>
3636
#include <lib/support/CodeUtils.h>
3737
#include <lib/support/DefaultStorageKeyAllocator.h>
38-
#include <lib/support/ErrorStr.h>
3938
#include <lib/support/PersistedCounter.h>
4039
#include <lib/support/TestGroupData.h>
4140
#include <lib/support/logging/CHIPLogging.h>
@@ -306,7 +305,7 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
306305
exit:
307306
if (err != CHIP_NO_ERROR)
308307
{
309-
ChipLogError(AppServer, "ERROR setting up transport: %s", ErrorStr(err));
308+
ChipLogError(AppServer, "ERROR setting up transport: %" CHIP_ERROR_FORMAT, err.Format());
310309
}
311310
else
312311
{
@@ -436,7 +435,7 @@ CHIP_ERROR Server::SendUserDirectedCommissioningRequest(chip::Transport::PeerAdd
436435
err = app::DnssdServer::Instance().GetCommissionableInstanceName(nameBuffer, sizeof(nameBuffer));
437436
if (err != CHIP_NO_ERROR)
438437
{
439-
ChipLogError(AppServer, "Failed to get mdns instance name error: %s", ErrorStr(err));
438+
ChipLogError(AppServer, "Failed to get mdns instance name error: %" CHIP_ERROR_FORMAT, err.Format());
440439
return err;
441440
}
442441
ChipLogDetail(AppServer, "instanceName=%s", nameBuffer);
@@ -455,7 +454,7 @@ CHIP_ERROR Server::SendUserDirectedCommissioningRequest(chip::Transport::PeerAdd
455454
}
456455
else
457456
{
458-
ChipLogError(AppServer, "Send UDC request failed, err: %s\n", chip::ErrorStr(err));
457+
ChipLogError(AppServer, "Send UDC request failed, err: %" CHIP_ERROR_FORMAT, err.Format());
459458
}
460459
return err;
461460
}

‎src/app/server/java/AndroidAppServerWrapper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ CHIP_ERROR ChipAndroidAppInit(void)
6464
exit:
6565
if (err != CHIP_NO_ERROR)
6666
{
67-
ChipLogProgress(NotSpecified, "Failed to run ChipAndroidAppInit: %s ", ErrorStr(err));
67+
ChipLogProgress(NotSpecified, "Failed to run ChipAndroidAppInit: %" CHIP_ERROR_FORMAT, err.Format());
6868
return err;
6969
}
7070
return err;

‎src/app/util/ember-compatibility-functions.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@ CHIP_ERROR WriteSingleClusterData(const SubjectDescriptor & aSubjectDescriptor,
10261026
uint16_t dataLen = 0;
10271027
if ((preparationError = prepareWriteData(attributeMetadata, aReader, dataLen)) != CHIP_NO_ERROR)
10281028
{
1029-
ChipLogDetail(Zcl, "Failed to prepare data to write: %s", ErrorStr(preparationError));
1029+
ChipLogDetail(Zcl, "Failed to prepare data to write: %" CHIP_ERROR_FORMAT, preparationError.Format());
10301030
return apWriteHandler->AddStatus(aPath, Protocols::InteractionModel::Status::InvalidValue);
10311031
}
10321032

‎src/ble/BleError.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
#include <ble/BleError.h>
3131
#include <ble/BleLayer.h>
3232

33-
#include <lib/support/ErrorStr.h>
34-
3533
namespace chip {
3634
namespace Ble {
3735

‎src/include/platform/internal/GenericPlatformManagerImpl.ipp

+8-7
Original file line numberDiff line numberDiff line change
@@ -61,31 +61,31 @@ CHIP_ERROR GenericPlatformManagerImpl<ImplClass>::_InitChipStack()
6161
err = InitEntropy();
6262
if (err != CHIP_NO_ERROR)
6363
{
64-
ChipLogError(DeviceLayer, "Entropy initialization failed: %s", ErrorStr(err));
64+
ChipLogError(DeviceLayer, "Entropy initialization failed: %" CHIP_ERROR_FORMAT, err.Format());
6565
}
6666
SuccessOrExit(err);
6767

6868
// Initialize the CHIP system layer.
6969
err = SystemLayer().Init();
7070
if (err != CHIP_NO_ERROR)
7171
{
72-
ChipLogError(DeviceLayer, "SystemLayer initialization failed: %s", ErrorStr(err));
72+
ChipLogError(DeviceLayer, "SystemLayer initialization failed: %" CHIP_ERROR_FORMAT, err.Format());
7373
}
7474
SuccessOrExit(err);
7575

7676
// Initialize the Configuration Manager.
7777
err = ConfigurationMgr().Init();
7878
if (err != CHIP_NO_ERROR)
7979
{
80-
ChipLogError(DeviceLayer, "Configuration Manager initialization failed: %s", ErrorStr(err));
80+
ChipLogError(DeviceLayer, "Configuration Manager initialization failed: %" CHIP_ERROR_FORMAT, err.Format());
8181
}
8282
SuccessOrExit(err);
8383

8484
// Initialize the CHIP UDP layer.
8585
err = UDPEndPointManager()->Init(SystemLayer());
8686
if (err != CHIP_NO_ERROR)
8787
{
88-
ChipLogError(DeviceLayer, "UDP initialization failed: %s", ErrorStr(err));
88+
ChipLogError(DeviceLayer, "UDP initialization failed: %" CHIP_ERROR_FORMAT, err.Format());
8989
}
9090
SuccessOrExit(err);
9191

@@ -96,7 +96,7 @@ CHIP_ERROR GenericPlatformManagerImpl<ImplClass>::_InitChipStack()
9696
err = BLEMgr().Init();
9797
if (err != CHIP_NO_ERROR)
9898
{
99-
ChipLogError(DeviceLayer, "BLEManager initialization failed: %s", ErrorStr(err));
99+
ChipLogError(DeviceLayer, "BLEManager initialization failed: %" CHIP_ERROR_FORMAT, err.Format());
100100
}
101101
SuccessOrExit(err);
102102
#endif
@@ -105,14 +105,15 @@ CHIP_ERROR GenericPlatformManagerImpl<ImplClass>::_InitChipStack()
105105
err = ConnectivityMgr().Init();
106106
if (err != CHIP_NO_ERROR)
107107
{
108-
ChipLogError(DeviceLayer, "Connectivity Manager initialization failed: %s", ErrorStr(err));
108+
ChipLogError(DeviceLayer, "Connectivity Manager initialization failed: %" CHIP_ERROR_FORMAT, err.Format());
109109
}
110110
SuccessOrExit(err);
111111

112112
// Initialize the NFC Manager.
113113
#if CHIP_DEVICE_CONFIG_ENABLE_NFC
114114
err = NFCMgr().Init();
115-
VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(DeviceLayer, "NFC Manager initialization failed: %s", ErrorStr(err)));
115+
VerifyOrExit(err == CHIP_NO_ERROR,
116+
ChipLogError(DeviceLayer, "NFC Manager initialization failed: %" CHIP_ERROR_FORMAT, err.Format()));
116117
#endif
117118

118119
// TODO Initialize CHIP Event Logging.

‎src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ void GenericPlatformManagerImpl_FreeRTOS<ImplClass>::_RunEventLoop(void)
175175
err = static_cast<System::LayerImplFreeRTOS &>(DeviceLayer::SystemLayer()).HandlePlatformTimer();
176176
if (err != CHIP_NO_ERROR)
177177
{
178-
ChipLogError(DeviceLayer, "Error handling CHIP timers: %s", ErrorStr(err));
178+
ChipLogError(DeviceLayer, "Error handling CHIP timers: %" CHIP_ERROR_FORMAT, err.Format());
179179
}
180180

181181
// When processing the event queue below, do not wait if the queue is empty. Instead

‎src/inet/InetError.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
#include <inet/Inet.h>
2727
#include <inet/InetError.h>
2828

29-
#include <lib/support/ErrorStr.h>
30-
3129
extern void FormatError(char * buf, uint16_t bufSize, const char * subsys, int32_t err, const char * desc);
3230

3331
namespace chip {

‎src/lib/asn1/ASN1Error.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include <stdlib.h>
2626

2727
#include <lib/asn1/ASN1.h>
28-
#include <lib/support/ErrorStr.h>
2928

3029
namespace chip {
3130
namespace ASN1 {

0 commit comments

Comments
 (0)