Skip to content

Commit 279c835

Browse files
gmarcosbgmarcosb
authored
Batch project-chip#11 nodiscard errors: platform (project-chip#41869)
1 parent 682ef15 commit 279c835

20 files changed

+96
-112
lines changed

‎src/platform/Linux/BLEManagerImpl.cpp‎

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,15 @@ BLEManagerImpl BLEManagerImpl::sInstance;
7878

7979
CHIP_ERROR BLEManagerImpl::_Init()
8080
{
81-
CHIP_ERROR err;
82-
83-
err = BleLayer::Init(this, this, this, &DeviceLayer::SystemLayer());
84-
SuccessOrExit(err);
81+
ReturnErrorOnFailure(BleLayer::Init(this, this, this, &DeviceLayer::SystemLayer()));
8582

8683
mServiceMode = ConnectivityManager::kCHIPoBLEServiceMode_Enabled;
8784
mFlags.ClearAll().Set(Flags::kAdvertisingEnabled, CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART && !mIsCentral);
8885
mFlags.Set(Flags::kFastAdvertisingEnabled, true);
8986

9087
memset(mDeviceName, 0, sizeof(mDeviceName));
9188

92-
DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveBLEState(); });
93-
94-
exit:
95-
return err;
89+
return DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveBLEState(); });
9690
}
9791

9892
void BLEManagerImpl::_Shutdown()
@@ -112,16 +106,12 @@ void BLEManagerImpl::_Shutdown()
112106

113107
CHIP_ERROR BLEManagerImpl::_SetAdvertisingEnabled(bool val)
114108
{
115-
CHIP_ERROR err = CHIP_NO_ERROR;
116-
117109
if (mFlags.Has(Flags::kAdvertisingEnabled) != val)
118110
{
119111
mFlags.Set(Flags::kAdvertisingEnabled, val);
120112
}
121113

122-
DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveBLEState(); });
123-
124-
return err;
114+
return DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveBLEState(); });
125115
}
126116

127117
CHIP_ERROR BLEManagerImpl::_SetAdvertisingMode(BLEAdvertisingMode mode)
@@ -138,8 +128,7 @@ CHIP_ERROR BLEManagerImpl::_SetAdvertisingMode(BLEAdvertisingMode mode)
138128
return CHIP_ERROR_INVALID_ARGUMENT;
139129
}
140130
mFlags.Set(Flags::kAdvertisingRefreshNeeded);
141-
DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveBLEState(); });
142-
return CHIP_NO_ERROR;
131+
return DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveBLEState(); });
143132
}
144133

145134
CHIP_ERROR BLEManagerImpl::_GetDeviceName(char * buf, size_t bufSize)
@@ -155,27 +144,24 @@ CHIP_ERROR BLEManagerImpl::_GetDeviceName(char * buf, size_t bufSize)
155144

156145
CHIP_ERROR BLEManagerImpl::_SetDeviceName(const char * deviceName)
157146
{
158-
CHIP_ERROR err = CHIP_NO_ERROR;
159-
160-
VerifyOrExit(mServiceMode != ConnectivityManager::kCHIPoBLEServiceMode_NotSupported, err = CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE);
147+
VerifyOrReturnError(mServiceMode != ConnectivityManager::kCHIPoBLEServiceMode_NotSupported,
148+
CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE);
161149

162150
if (deviceName != nullptr && deviceName[0] != 0)
163151
{
164-
VerifyOrExit(strlen(deviceName) < kMaxDeviceNameLength, err = CHIP_ERROR_INVALID_ARGUMENT);
152+
VerifyOrReturnError(strlen(deviceName) < kMaxDeviceNameLength, CHIP_ERROR_INVALID_ARGUMENT);
165153
strcpy(mDeviceName, deviceName);
166154
mFlags.Set(Flags::kUseCustomDeviceName);
167155
}
168156
else
169157
{
170158
uint16_t discriminator;
171-
SuccessOrExit(err = GetCommissionableDataProvider()->GetSetupDiscriminator(discriminator));
159+
ReturnErrorOnFailure(GetCommissionableDataProvider()->GetSetupDiscriminator(discriminator));
172160
snprintf(mDeviceName, sizeof(mDeviceName), "%s%04u", CHIP_DEVICE_CONFIG_BLE_DEVICE_NAME_PREFIX, discriminator);
173161
mDeviceName[kMaxDeviceNameLength] = 0;
174162
mFlags.Clear(Flags::kUseCustomDeviceName);
175163
}
176-
177-
exit:
178-
return err;
164+
return CHIP_NO_ERROR;
179165
}
180166

181167
uint16_t BLEManagerImpl::_NumConnections()
@@ -668,7 +654,7 @@ void BLEManagerImpl::HandleAdvertisingTimer(chip::System::Layer *, void * appSta
668654
if (self->mFlags.Has(Flags::kFastAdvertisingEnabled))
669655
{
670656
ChipLogDetail(DeviceLayer, "bleAdv Timeout : Start slow advertisement");
671-
self->_SetAdvertisingMode(BLEAdvertisingMode::kSlowAdvertising);
657+
TEMPORARY_RETURN_IGNORED self->_SetAdvertisingMode(BLEAdvertisingMode::kSlowAdvertising);
672658
#if CHIP_DEVICE_CONFIG_EXT_ADVERTISING
673659
self->mFlags.Clear(Flags::kExtAdvertisingEnabled);
674660
DeviceLayer::SystemLayer().StartTimer(kSlowAdvertiseTimeout, HandleAdvertisingTimer, self);
@@ -711,7 +697,7 @@ void BLEManagerImpl::InitiateScan(BleScanState scanType)
711697
err = DeviceLayer::SystemLayer().StartTimer(kNewConnectionScanTimeout, HandleScanTimer, this);
712698
VerifyOrExit(err == CHIP_NO_ERROR, {
713699
mBLEScanConfig.mBleScanState = BleScanState::kNotScanning;
714-
mDeviceScanner.StopScan();
700+
TEMPORARY_RETURN_IGNORED mDeviceScanner.StopScan();
715701
ChipLogError(Ble, "Failed to start BLE scan timeout: %" CHIP_ERROR_FORMAT, err.Format());
716702
});
717703

@@ -726,7 +712,7 @@ void BLEManagerImpl::HandleScanTimer(chip::System::Layer *, void * appState)
726712
{
727713
auto * manager = static_cast<BLEManagerImpl *>(appState);
728714
manager->OnScanError(CHIP_ERROR_TIMEOUT);
729-
manager->mDeviceScanner.StopScan();
715+
TEMPORARY_RETURN_IGNORED manager->mDeviceScanner.StopScan();
730716
}
731717

732718
void BLEManagerImpl::CleanScanConfig()
@@ -751,7 +737,8 @@ void BLEManagerImpl::NewConnection(BleLayer * bleLayer, void * appState, const S
751737
mBLEScanConfig.mAppState = appState;
752738

753739
// Scan initiation performed async, to ensure that the BLE subsystem is initialized.
754-
DeviceLayer::SystemLayer().ScheduleLambda([this] { InitiateScan(BleScanState::kScanForDiscriminator); });
740+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda(
741+
[this] { InitiateScan(BleScanState::kScanForDiscriminator); });
755742
}
756743

757744
CHIP_ERROR BLEManagerImpl::CancelConnection()
@@ -762,7 +749,7 @@ CHIP_ERROR BLEManagerImpl::CancelConnection()
762749
else if (mBLEScanConfig.mBleScanState != BleScanState::kNotScanning)
763750
{
764751
DeviceLayer::SystemLayer().CancelTimer(HandleScanTimer, this);
765-
mDeviceScanner.StopScan();
752+
return mDeviceScanner.StopScan();
766753
}
767754
return CHIP_NO_ERROR;
768755
}
@@ -865,13 +852,12 @@ void BLEManagerImpl::OnDeviceScanned(BluezDevice1 & device, const chip::Ble::Chi
865852
// StopScan should also be performed in the ChipStack thread.
866853
// At the same time, the scan timer also needs to be canceled in the ChipStack thread.
867854
DeviceLayer::SystemLayer().CancelTimer(HandleScanTimer, this);
868-
mDeviceScanner.StopScan();
855+
TEMPORARY_RETURN_IGNORED mDeviceScanner.StopScan();
869856
// Stop scanning and then start connecting timer
870-
DeviceLayer::SystemLayer().StartTimer(kConnectTimeout, HandleConnectTimer, this);
857+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().StartTimer(kConnectTimeout, HandleConnectTimer, this);
871858
chip::DeviceLayer::PlatformMgr().UnlockChipStack();
872859

873-
CHIP_ERROR err = mEndpoint.ConnectDevice(device);
874-
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Ble, "Device connection failed: %" CHIP_ERROR_FORMAT, err.Format()));
860+
ReturnAndLogOnFailure(mEndpoint.ConnectDevice(device), Ble, "Device connection failed");
875861

876862
ChipLogProgress(Ble, "New device connected: %s", address);
877863
}

‎src/platform/Linux/CHIPLinuxStorage.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ CHIP_ERROR ChipLinuxStorage::WriteValueBin(const char * key, const uint8_t * dat
265265
// Store it
266266
if (retval == CHIP_NO_ERROR)
267267
{
268-
WriteValueStr(key, encodedData.Get());
268+
retval = WriteValueStr(key, encodedData.Get());
269269
}
270270

271271
return retval;

‎src/platform/Linux/ConfigurationManagerImpl.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ bool ConfigurationManagerImpl::CanFactoryReset()
186186

187187
void ConfigurationManagerImpl::InitiateFactoryReset()
188188
{
189-
PlatformMgr().ScheduleWork(DoFactoryReset);
189+
TEMPORARY_RETURN_IGNORED PlatformMgr().ScheduleWork(DoFactoryReset);
190190
}
191191

192192
CHIP_ERROR ConfigurationManagerImpl::ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value)

‎src/platform/Linux/ConnectivityManagerImpl.cpp‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
144144
}
145145
#endif
146146
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
147-
WiFiPAF::WiFiPAFLayer::GetWiFiPAFLayer().Init(&DeviceLayer::SystemLayer());
148-
#endif
149-
147+
return WiFiPAF::WiFiPAFLayer::GetWiFiPAFLayer().Init(&DeviceLayer::SystemLayer());
148+
#else
150149
return CHIP_NO_ERROR;
150+
#endif
151151
}
152152

153153
void ConnectivityManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
@@ -171,7 +171,8 @@ void ConnectivityManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
171171
ChipLogProgress(DeviceLayer, "WiFi-PAF: event: kCHIPoWiFiPAFConnected");
172172
WiFiPAF::WiFiPAFSession SessionInfo;
173173
memcpy(&SessionInfo, &event->CHIPoWiFiPAFReceived.SessionInfo, sizeof(WiFiPAF::WiFiPAFSession));
174-
WiFiPafLayer.HandleTransportConnectionInitiated(SessionInfo, mOnPafSubscribeComplete, mAppState, mOnPafSubscribeError);
174+
TEMPORARY_RETURN_IGNORED WiFiPafLayer.HandleTransportConnectionInitiated(SessionInfo, mOnPafSubscribeComplete, mAppState,
175+
mOnPafSubscribeError);
175176
break;
176177
}
177178
case DeviceEventType::kCHIPoWiFiPAFCancelConnect: {
@@ -187,7 +188,7 @@ void ConnectivityManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
187188
ChipLogProgress(DeviceLayer, "WiFi-PAF: event: kCHIPoWiFiPAFWriteDone");
188189
WiFiPAF::WiFiPAFSession TxInfo;
189190
memcpy(&TxInfo, &event->CHIPoWiFiPAFReceived.SessionInfo, sizeof(WiFiPAF::WiFiPAFSession));
190-
WiFiPafLayer.HandleWriteConfirmed(TxInfo, event->CHIPoWiFiPAFReceived.result);
191+
TEMPORARY_RETURN_IGNORED WiFiPafLayer.HandleWriteConfirmed(TxInfo, event->CHIPoWiFiPAFReceived.result);
191192
break;
192193
}
193194
}
@@ -311,7 +312,7 @@ CHIP_ERROR ConnectivityManagerImpl::_SetWiFiAPMode(WiFiAPMode val)
311312
ChipLogProgress(DeviceLayer, "WiFi AP mode change: %s -> %s", WiFiAPModeToStr(mWiFiAPMode), WiFiAPModeToStr(val));
312313
mWiFiAPMode = val;
313314

314-
DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveAPState(); });
315+
return DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveAPState(); });
315316
}
316317

317318
exit:
@@ -324,7 +325,7 @@ void ConnectivityManagerImpl::_DemandStartWiFiAP()
324325
{
325326
ChipLogProgress(DeviceLayer, "wpa_supplicant: Demand start WiFi AP");
326327
mLastAPDemandTime = System::SystemClock().GetMonotonicTimestamp();
327-
DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveAPState(); });
328+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveAPState(); });
328329
}
329330
else
330331
{
@@ -338,7 +339,7 @@ void ConnectivityManagerImpl::_StopOnDemandWiFiAP()
338339
{
339340
ChipLogProgress(DeviceLayer, "wpa_supplicant: Demand stop WiFi AP");
340341
mLastAPDemandTime = System::Clock::kZero;
341-
DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveAPState(); });
342+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveAPState(); });
342343
}
343344
else
344345
{
@@ -360,7 +361,7 @@ void ConnectivityManagerImpl::_MaintainOnDemandWiFiAP()
360361
void ConnectivityManagerImpl::_SetWiFiAPIdleTimeout(System::Clock::Timeout val)
361362
{
362363
mWiFiAPIdleTimeout = val;
363-
DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveAPState(); });
364+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([this] { DriveAPState(); });
364365
}
365366

366367
void ConnectivityManagerImpl::NotifyWiFiConnectivityChange(ConnectivityChange change)
@@ -413,7 +414,7 @@ void ConnectivityManagerImpl::_OnWpaPropertiesChanged(WpaSupplicant1Interface *
413414

414415
if (delegate != nullptr)
415416
{
416-
DeviceLayer::SystemLayer().ScheduleLambda([delegate, reason]() {
417+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([delegate, reason]() {
417418
delegate->OnDisconnectionDetected(reason);
418419
delegate->OnConnectionStatusChanged(static_cast<uint8_t>(ConnectionStatusEnum::kNotConnected));
419420
});
@@ -444,7 +445,7 @@ void ConnectivityManagerImpl::_OnWpaPropertiesChanged(WpaSupplicant1Interface *
444445
break;
445446
}
446447

447-
DeviceLayer::SystemLayer().ScheduleLambda([this, reason]() {
448+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([this, reason]() {
448449
if (mpConnectCallback != nullptr)
449450
{
450451
mpConnectCallback->OnResult(NetworkCommissioning::Status::kUnknownError, CharSpan(), reason);
@@ -453,13 +454,13 @@ void ConnectivityManagerImpl::_OnWpaPropertiesChanged(WpaSupplicant1Interface *
453454
});
454455
if (delegate != nullptr)
455456
{
456-
DeviceLayer::SystemLayer().ScheduleLambda([delegate, associationFailureCause, status]() {
457+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([delegate, associationFailureCause, status]() {
457458
delegate->OnAssociationFailureDetected(associationFailureCause, status);
458459
});
459460
}
460461
}
461462

462-
DeviceLayer::SystemLayer().ScheduleLambda([]() { ConnectivityMgrImpl().UpdateNetworkStatus(); });
463+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([]() { ConnectivityMgrImpl().UpdateNetworkStatus(); });
463464
NotifyWiFiConnectivityChange(kConnectivity_Lost);
464465

465466
mAssociationStarted = false;
@@ -468,16 +469,16 @@ void ConnectivityManagerImpl::_OnWpaPropertiesChanged(WpaSupplicant1Interface *
468469
{
469470
if (delegate != nullptr)
470471
{
471-
DeviceLayer::SystemLayer().ScheduleLambda(
472+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda(
472473
[delegate]() { delegate->OnConnectionStatusChanged(static_cast<uint8_t>(ConnectionStatusEnum::kConnected)); });
473474
}
474-
DeviceLayer::SystemLayer().ScheduleLambda([]() { ConnectivityMgrImpl().UpdateNetworkStatus(); });
475+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([]() { ConnectivityMgrImpl().UpdateNetworkStatus(); });
475476
}
476477
else if (g_strcmp0(state, "completed") == 0)
477478
{
478479
if (mAssociationStarted)
479480
{
480-
DeviceLayer::SystemLayer().ScheduleLambda([this]() {
481+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([this]() {
481482
if (mpConnectCallback != nullptr)
482483
{
483484
mpConnectCallback->OnResult(NetworkCommissioning::Status::kSuccess, CharSpan(), 0);
@@ -524,7 +525,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceProxyReady(GObject * sourceObject,
524525
}
525526

526527
// We need to stop auto scan or it will block our network scan.
527-
DeviceLayer::SystemLayer().ScheduleLambda([this]() {
528+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([this]() {
528529
CHIP_ERROR errInner = StopAutoScan();
529530
if (errInner != CHIP_NO_ERROR)
530531
{
@@ -765,7 +766,7 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAF
765766
struct PAFPublishSSI PafPublish_ssi;
766767

767768
PafPublish_ssi.DevOpCode = 0;
768-
VerifyOrDie(DeviceLayer::GetCommissionableDataProvider()->GetSetupDiscriminator(PafPublish_ssi.DevInfo) == CHIP_NO_ERROR);
769+
SuccessOrDie(DeviceLayer::GetCommissionableDataProvider()->GetSetupDiscriminator(PafPublish_ssi.DevInfo));
769770
if (DeviceLayer::GetDeviceInstanceInfoProvider()->GetProductId(PafPublish_ssi.ProductId) != CHIP_NO_ERROR)
770771
{
771772
PafPublish_ssi.ProductId = 0;
@@ -849,7 +850,7 @@ void ConnectivityManagerImpl::StartNonConcurrentWiFiManagement()
849850
{
850851
if (IsWiFiManagementStarted())
851852
{
852-
DeviceControlServer::DeviceControlSvr().PostOperationalNetworkStartedEvent();
853+
TEMPORARY_RETURN_IGNORED DeviceControlServer::DeviceControlSvr().PostOperationalNetworkStartedEvent();
853854
ChipLogProgress(DeviceLayer, "Non-concurrent mode Wi-Fi Management Started.");
854855
return;
855856
}
@@ -957,7 +958,7 @@ void ConnectivityManagerImpl::DriveAPState()
957958
exit:
958959
if (err != CHIP_NO_ERROR)
959960
{
960-
SetWiFiAPMode(kWiFiAPMode_Disabled);
961+
TEMPORARY_RETURN_IGNORED SetWiFiAPMode(kWiFiAPMode_Disabled);
961962
ChipLogError(DeviceLayer, "Drive AP state failed: %" CHIP_ERROR_FORMAT, err.Format());
962963
}
963964
}
@@ -1383,7 +1384,7 @@ void ConnectivityManagerImpl::OnReplied(GVariant * reply_info)
13831384
Error Checking
13841385
*/
13851386
uint16_t SetupDiscriminator;
1386-
DeviceLayer::GetCommissionableDataProvider()->GetSetupDiscriminator(SetupDiscriminator);
1387+
TEMPORARY_RETURN_IGNORED DeviceLayer::GetCommissionableDataProvider()->GetSetupDiscriminator(SetupDiscriminator);
13871388
if ((pPublishSSI->DevInfo != SetupDiscriminator) || (srv_proto_type != nan_service_protocol_type::NAN_SRV_PROTO_CSA_MATTER))
13881389
{
13891390
ChipLogProgress(DeviceLayer, "WiFi-PAF: OnReplied, mismatched discriminator, got %u, ours: %u", pPublishSSI->DevInfo,
@@ -1417,7 +1418,7 @@ void ConnectivityManagerImpl::OnReplied(GVariant * reply_info)
14171418
pPafInfo->id = publish_id;
14181419
pPafInfo->peer_id = peer_subscribe_id;
14191420
memcpy(pPafInfo->peer_addr, peer_addr, sizeof(uint8_t) * 6);
1420-
WiFiPafLayer.HandleTransportConnectionInitiated(*pPafInfo);
1421+
TEMPORARY_RETURN_IGNORED WiFiPafLayer.HandleTransportConnectionInitiated(*pPafInfo);
14211422
}
14221423

14231424
void ConnectivityManagerImpl::OnNanReceive(GVariant * obj)
@@ -1470,15 +1471,15 @@ void ConnectivityManagerImpl::OnNanPublishTerminated(guint public_id, gchar * re
14701471
ChipLogProgress(Controller, "WiFi-PAF: Publish terminated (%u, %s)", public_id, reason);
14711472
WiFiPAFSession sessionInfo = { .id = public_id };
14721473
WiFiPAFLayer & WiFiPafLayer = WiFiPAFLayer::GetWiFiPAFLayer();
1473-
WiFiPafLayer.RmPafSession(PafInfoAccess::kAccSessionId, sessionInfo);
1474+
TEMPORARY_RETURN_IGNORED WiFiPafLayer.RmPafSession(PafInfoAccess::kAccSessionId, sessionInfo);
14741475
}
14751476

14761477
void ConnectivityManagerImpl::OnNanSubscribeTerminated(guint subscribe_id, gchar * reason)
14771478
{
14781479
ChipLogProgress(Controller, "WiFi-PAF: Subscription terminated (%u, %s)", subscribe_id, reason);
14791480
WiFiPAFSession sessionInfo = { .id = subscribe_id };
14801481
WiFiPAFLayer & WiFiPafLayer = WiFiPAFLayer::GetWiFiPAFLayer();
1481-
WiFiPafLayer.RmPafSession(PafInfoAccess::kAccSessionId, sessionInfo);
1482+
TEMPORARY_RETURN_IGNORED WiFiPafLayer.RmPafSession(PafInfoAccess::kAccSessionId, sessionInfo);
14821483
/*
14831484
Indicate the connection event
14841485
*/
@@ -2216,7 +2217,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceScanDone(WpaSupplicant1Interface *
22162217
if (bsss == nullptr)
22172218
{
22182219
ChipLogProgress(DeviceLayer, "wpa_supplicant: no network found");
2219-
DeviceLayer::SystemLayer().ScheduleLambda([this]() {
2220+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([this]() {
22202221
if (mpScanCallback != nullptr)
22212222
{
22222223
mpScanCallback->OnFinished(Status::kSuccess, CharSpan(), nullptr);
@@ -2240,7 +2241,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceScanDone(WpaSupplicant1Interface *
22402241
}
22412242
}
22422243

2243-
DeviceLayer::SystemLayer().ScheduleLambda([this, networkScanned]() {
2244+
TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleLambda([this, networkScanned]() {
22442245
// Note: We cannot post an event in ScheduleLambda since std::vector is not trivial copyable.
22452246
if (mpScanCallback != nullptr)
22462247
{

0 commit comments

Comments
 (0)