nodiscard ChipError Batch project-chip#19: platform-specific src: Darwin (project-chip#42083)

gmarcosb · web-flow · commit fbccfe590cb2 · 2025-11-21T23:16:23.000Z
* Batch project-chip#19 nodiscard errors: platform-specific src: Darwin * Fix CI * Apply review suggestions * Apply review suggestions
diff --git a/src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm b/src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm
@@ -123,7 +123,7 @@ CHIP_ERROR Stop(id owner)
 
 #if CONFIG_NETWORK_LAYER_BLE
         mBleScannerDelegateOwner = owner; // retain the owner until OnBleScanStopped is called
-        PlatformMgrImpl().StopBleScan(); // doesn't actually fail, and if it did we'd want to carry on regardless
+        TEMPORARY_RETURN_IGNORED PlatformMgrImpl().StopBleScan(); // doesn't actually fail, and if it did we'd want to carry on regardless
 #else
         (void) owner;
 #endif // CONFIG_NETWORK_LAYER_BLE
diff --git a/src/darwin/Framework/CHIP/MTRCommissioneeInfo.mm b/src/darwin/Framework/CHIP/MTRCommissioneeInfo.mm
@@ -69,7 +69,7 @@ - (instancetype)initWithCommissioningInfo:(const chip::Controller::ReadCommissio
         // attributes, using a wildcard-endpoint path.
         pathFilters.emplace_back(MTRClusterIDTypeNetworkCommissioningID, MTRAttributeIDTypeGlobalAttributeFeatureMapID);
 
-        info.attributes->ForEachAttribute([&](const ConcreteAttributePath & path) -> CHIP_ERROR {
+        TEMPORARY_RETURN_IGNORED info.attributes->ForEachAttribute([&](const ConcreteAttributePath & path) -> CHIP_ERROR {
             // Only grab paths that are included in extraAttributesToRead so that
             // API consumers don't develop dependencies on implementation details
             // (like which other attributes we happen to read).
@@ -118,7 +118,7 @@ - (instancetype)initWithCommissioningInfo:(const chip::Controller::ReadCommissio
         _attributes = attributes;
 
         // Now grab the Network Commissioning information in a nicer form.
-        info.attributes->ForEachAttribute(MTRClusterIDTypeNetworkCommissioningID, [&](const ConcreteAttributePath & path) -> CHIP_ERROR {
+        TEMPORARY_RETURN_IGNORED info.attributes->ForEachAttribute(MTRClusterIDTypeNetworkCommissioningID, [&](const ConcreteAttributePath & path) -> CHIP_ERROR {
             if (path.mAttributeId != MTRAttributeIDTypeGlobalAttributeFeatureMapID) {
                 return CHIP_NO_ERROR;
             }
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm
@@ -211,7 +211,7 @@ - (instancetype)init
 
     // Start the work queue and leave it running. There is no performance
     // cost to having an idle dispatch queue, and it simplifies our logic.
-    DeviceLayer::PlatformMgrImpl().StartEventLoopTask();
+    TEMPORARY_RETURN_IGNORED DeviceLayer::PlatformMgrImpl().StartEventLoopTask();
 
     _chipWorkQueue = DeviceLayer::PlatformMgrImpl().GetWorkQueue();
     _controllerFactory = &DeviceControllerFactory::GetInstance();
@@ -779,7 +779,7 @@ - (void)preWarmCommissioningSession
             MTR_LOG_ERROR("Can't pre-warm, Matter controller factory is not running");
         } else {
             MTR_LOG("Pre-warming commissioning session");
-            self->_controllerFactory->EnsureAndRetainSystemState();
+            TEMPORARY_RETURN_IGNORED self->_controllerFactory->EnsureAndRetainSystemState();
             err = DeviceLayer::PlatformMgrImpl().StartBleScan(&self->_preWarmingDelegate, DeviceLayer::BleScanMode::kPreWarm);
             if (err != CHIP_NO_ERROR) {
                 MTR_LOG_ERROR("Pre-warming failed: %" CHIP_ERROR_FORMAT, err.Format());
@@ -934,7 +934,7 @@ - (void)controllerShuttingDown:(MTRDeviceController_Concrete *)controller
             // Clear out out group keys for this fabric index, in case fabric
             // indices get reused later.  If a new controller is started on the
             // same fabric it will be handed the IPK at that point.
-            self->_groupDataProvider.RemoveGroupKeys(fabricIndex);
+            TEMPORARY_RETURN_IGNORED self->_groupDataProvider.RemoveGroupKeys(fabricIndex);
         }
 
         // If there are no other controllers left, we can shut down some things.
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.mm
@@ -316,14 +316,14 @@ - (void)setOTAProviderDelegate:(id<MTROTAProviderDelegate>)otaProviderDelegate q
 + (nullable NSNumber *)nodeIDFromNOC:(MTRCertificateDERBytes)noc
 {
     NSNumber * nodeID = nil;
-    ExtractNodeIDFromNOC(noc, &nodeID);
+    TEMPORARY_RETURN_IGNORED ExtractNodeIDFromNOC(noc, &nodeID);
     return nodeID;
 }
 
 + (nullable NSNumber *)fabricIDFromNOC:(MTRCertificateDERBytes)noc
 {
     NSNumber * fabricID = nil;
-    ExtractFabricIDFromNOC(noc, &fabricID);
+    TEMPORARY_RETURN_IGNORED ExtractFabricIDFromNOC(noc, &fabricID);
     return fabricID;
 }
 
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm b/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm
@@ -359,7 +359,7 @@ - (void)_controllerSuspended
             auto * fabricTable = factory.fabricTable;
             if (fabricTable) {
                 // We don't care about errors here. If our fabric is gone, nothing to do.
-                fabricTable->SetShouldAdvertiseIdentity(self->_storedFabricIndex, chip::FabricTable::AdvertiseIdentity::No);
+                TEMPORARY_RETURN_IGNORED fabricTable->SetShouldAdvertiseIdentity(self->_storedFabricIndex, chip::FabricTable::AdvertiseIdentity::No);
                 [factory resetOperationalAdvertising];
             }
         }
@@ -376,7 +376,7 @@ - (void)_controllerResumed
             auto * fabricTable = factory.fabricTable;
             if (fabricTable) {
                 // We don't care about errors here. If our fabric is gone, nothing to do.
-                fabricTable->SetShouldAdvertiseIdentity(self->_storedFabricIndex, chip::FabricTable::AdvertiseIdentity::Yes);
+                TEMPORARY_RETURN_IGNORED fabricTable->SetShouldAdvertiseIdentity(self->_storedFabricIndex, chip::FabricTable::AdvertiseIdentity::Yes);
                 [factory resetOperationalAdvertising];
             }
         }
diff --git a/src/darwin/Framework/CHIP/MTRDiagnosticLogsDownloader.mm b/src/darwin/Framework/CHIP/MTRDiagnosticLogsDownloader.mm
@@ -667,16 +667,16 @@ - (void)handleBDXTransferSessionEndForFileDesignator:(NSString *)fileDesignator
 
         if (error != nil) {
             auto err = [MTRError errorToCHIPErrorCode:error];
-            transfer->Reject(err);
+            TEMPORARY_RETURN_IGNORED transfer->Reject(err);
         } else {
-            transfer->Accept();
+            TEMPORARY_RETURN_IGNORED transfer->Accept();
         }
     };
 
     auto abortHandler = ^(NSError * error) {
         assertChipStackLockedByCurrentThread();
         auto err = [MTRError errorToCHIPErrorCode:error];
-        transfer->Reject(err);
+        TEMPORARY_RETURN_IGNORED transfer->Reject(err);
     };
 
     [mDelegate handleBDXTransferSessionBeginForFileDesignator:fileDesignator
@@ -728,9 +728,9 @@ - (void)handleBDXTransferSessionEndForFileDesignator:(NSString *)fileDesignator
 
         if (error != nil) {
             auto err = [MTRError errorToCHIPErrorCode:error];
-            transfer->Reject(err);
+            TEMPORARY_RETURN_IGNORED transfer->Reject(err);
         } else {
-            transfer->Continue();
+            TEMPORARY_RETURN_IGNORED transfer->Continue();
         }
     };
 
diff --git a/src/darwin/Framework/CHIP/MTREndpointInfo.mm b/src/darwin/Framework/CHIP/MTREndpointInfo.mm
@@ -212,7 +212,7 @@ + (BOOL)populateChildrenForEndpoints:(NSDictionary<NSNumber *, MTREndpointInfo *
     using namespace Descriptor::Attributes;
 
     NSMutableDictionary<NSNumber *, MTREndpointInfo *> * endpoints = [[NSMutableDictionary alloc] init];
-    cache->ForEachAttribute(Descriptor::Id, [&](const ConcreteAttributePath & path) -> CHIP_ERROR {
+    TEMPORARY_RETURN_IGNORED cache->ForEachAttribute(Descriptor::Id, [&](const ConcreteAttributePath & path) -> CHIP_ERROR {
         VerifyOrReturnError(path.mAttributeId == DeviceTypeList::Id, CHIP_NO_ERROR);
 
         CHIP_ERROR err = CHIP_NO_ERROR;
diff --git a/src/darwin/Framework/CHIP/MTRFramework.mm b/src/darwin/Framework/CHIP/MTRFramework.mm
@@ -30,7 +30,7 @@ void MTRFrameworkInit()
         // malloc/free so there is nothing to initialize, so this just needs
         // to happen to avoid debug assertions.  The malloc version of
         // MemoryInit() never fails.
-        chip::Platform::MemoryInit();
+        TEMPORARY_RETURN_IGNORED chip::Platform::MemoryInit();
 
         // Suppress CHIP logging until we actually need it for redirection
         // (see MTRSetLogCallback()). Logging to os_log is always enabled.
diff --git a/src/darwin/Framework/CHIP/MTROTAImageTransferHandler.mm b/src/darwin/Framework/CHIP/MTROTAImageTransferHandler.mm
@@ -535,20 +535,18 @@ - (void)SetOtaImageTransferHandler:(MTROTAImageTransferHandler *)otaImageTransfe
         payloadHeader.GetMessageType(), ChipLogValueProtocolId(payloadHeader.GetProtocolID()));
 
     VerifyOrReturnError(ec != nullptr, CHIP_ERROR_INCORRECT_STATE);
-    CHIP_ERROR err;
 
     // If we receive a ReceiveInit message, then we prepare for transfer.
     //
     // If init succeeds, or is not needed, we send the message to the AsyncTransferFacilitator for processing.
     if (payloadHeader.HasMessageType(MessageType::ReceiveInit)) {
-        err = Init(ec);
+        CHIP_ERROR err = Init(ec);
         if (err != CHIP_NO_ERROR) {
             ChipLogError(Controller, "OnMessageReceived: Failed to prepare for transfer for BDX: %" CHIP_ERROR_FORMAT, err.Format());
             return err;
         }
     }
 
     // Send the message to the AsyncFacilitator to drive the BDX session state machine.
-    AsyncTransferFacilitator::OnMessageReceived(ec, payloadHeader, std::move(payload));
-    return err;
+    return AsyncTransferFacilitator::OnMessageReceived(ec, payloadHeader, std::move(payload));
 }
diff --git a/src/darwin/Framework/CHIP/MTROTAUnsolicitedBDXMessageHandler.mm b/src/darwin/Framework/CHIP/MTROTAUnsolicitedBDXMessageHandler.mm
@@ -48,7 +48,7 @@
     assertChipStackLockedByCurrentThread();
 
     VerifyOrReturn(mExchangeMgr != nullptr);
-    mExchangeMgr->UnregisterUnsolicitedMessageHandlerForProtocol(Protocols::BDX::Id);
+    TEMPORARY_RETURN_IGNORED mExchangeMgr->UnregisterUnsolicitedMessageHandlerForProtocol(Protocols::BDX::Id);
 
     VerifyOrReturn(mOTAImageTransferHandler != nullptr);
 
diff --git a/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm b/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm
@@ -266,7 +266,7 @@
     ReturnErrorOnFailure(reader.Next(kTLVType_ByteString, TLV::ContextTag(1)));
 
     ByteSpan csr(reader.GetReadPoint(), reader.GetLength());
-    reader.ExitContainer(containerType);
+    ReturnErrorOnFailure(reader.ExitContainer(containerType));
 
     chip::Crypto::P256PublicKey pubkey;
     ReturnErrorOnFailure(chip::Crypto::VerifyCertificateSigningRequest(csr.data(), csr.size(), pubkey));
diff --git a/src/darwin/Framework/CHIP/MTRP256KeypairBridge.mm b/src/darwin/Framework/CHIP/MTRP256KeypairBridge.mm
@@ -112,12 +112,11 @@
             return CHIP_ERROR_INTERNAL;
         }
     }
-    if (signature.length > out_signature.Capacity()) {
+    if (out_signature.SetLength(signature.length) != CHIP_NO_ERROR) {
         MTR_LOG_ERROR("ECDSA sign msg failure: unexpected signature size %llu vs %llu", static_cast<uint64_t>(signature.length),
             static_cast<uint64_t>(out_signature.Capacity()));
         return CHIP_ERROR_NO_MEMORY;
     }
-    out_signature.SetLength(signature.length);
     std::memcpy(out_signature.Bytes(), signature.bytes, signature.length);
     return CHIP_NO_ERROR;
 }
diff --git a/src/darwin/Framework/CHIP/MTRSessionResumptionStorageBridge.mm b/src/darwin/Framework/CHIP/MTRSessionResumptionStorageBridge.mm
@@ -132,7 +132,7 @@
         return CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     }
 
-    if (resumptionInfo.sharedSecret.length > sharedSecret.Capacity()) {
+    if (sharedSecret.SetLength(resumptionInfo.sharedSecret.length) != CHIP_NO_ERROR) {
         MTR_LOG_ERROR("Unable to return resumption shared secret: Stored size %llu is larger than allowed size %llu",
             static_cast<unsigned long long>(resumptionInfo.sharedSecret.length),
             static_cast<unsigned long long>(sharedSecret.Capacity()));
@@ -141,7 +141,6 @@
 
     nodeID = resumptionInfo.nodeID.unsignedLongLongValue;
     memcpy(resumptionId.data(), resumptionInfo.resumptionID.bytes, resumptionInfo.resumptionID.length);
-    sharedSecret.SetLength(resumptionInfo.sharedSecret.length);
     memcpy(sharedSecret.Bytes(), resumptionInfo.sharedSecret.bytes, resumptionInfo.sharedSecret.length);
     ReturnErrorOnFailure(SetToCATValues(resumptionInfo.caseAuthenticatedTags, peerCATs));
 
diff --git a/src/darwin/Framework/CHIP/MTRSetupPayload.mm b/src/darwin/Framework/CHIP/MTRSetupPayload.mm
@@ -469,20 +469,21 @@ - (nullable NSString *)serialNumber
 - (void)setSerialNumber:(nullable NSString *)serialNumber
 {
     _subPayloads = nil;
+    CHIP_ERROR err;
     if (serialNumber) {
         NSString * existing = self.serialNumber;
         if (existing) {
             // The underlying TLV tag can be encoded as either a string or an integer,
             // avoid changing it if the represented serial number is not changing.
             VerifyOrReturn(![existing isEqualToString:serialNumber]);
-            _payload.removeSerialNumber();
-        }
-        CHIP_ERROR err = _payload.addSerialNumber(serialNumber.UTF8String);
-        if (err != CHIP_NO_ERROR) {
-            MTR_LOG_ERROR("Ignoring unexpected error in SetupPayload::addSerialNumber: %" CHIP_ERROR_FORMAT, err.Format());
+            TEMPORARY_RETURN_IGNORED _payload.removeSerialNumber();
         }
+        err = _payload.addSerialNumber(serialNumber.UTF8String);
     } else {
-        _payload.removeSerialNumber();
+        err = _payload.removeSerialNumber();
+    }
+    if (err != CHIP_NO_ERROR) {
+        MTR_LOG_ERROR("Ignoring unexpected error in SetupPayload::addSerialNumber: %" CHIP_ERROR_FORMAT, err.Format());
     }
 }
 
@@ -510,7 +511,7 @@ - (MTROptionalQRCodeInfo *)vendorElementWithTag:(NSNumber *)tag
 - (void)removeVendorElementWithTag:(NSNumber *)tag
 {
     _subPayloads = nil;
-    _payload.removeOptionalVendorData(ValidateVendorTag(tag));
+    TEMPORARY_RETURN_IGNORED _payload.removeOptionalVendorData(ValidateVendorTag(tag));
 }
 
 - (void)addOrReplaceVendorElement:(MTROptionalQRCodeInfo *)element
diff --git a/src/darwin/Framework/CHIP/MTRThreadOperationalDataset.mm b/src/darwin/Framework/CHIP/MTRThreadOperationalDataset.mm
@@ -58,33 +58,33 @@ - (instancetype _Nullable)initWithNetworkName:(NSString *)networkName
 - (BOOL)_populateCppOperationalDataset
 {
     _cppThreadOperationalDataset.Clear();
-    _cppThreadOperationalDataset.SetNetworkName(self.networkName.UTF8String);
+    TEMPORARY_RETURN_IGNORED _cppThreadOperationalDataset.SetNetworkName(self.networkName.UTF8String);
 
     if (![self _checkDataLength:self.extendedPANID expectedLength:MTRSizeThreadExtendedPANID]) {
         MTR_LOG_ERROR("Invalid ExtendedPANID");
         return NO;
     }
     uint8_t extendedPanId[MTRSizeThreadExtendedPANID];
     [self.extendedPANID getBytes:&extendedPanId length:MTRSizeThreadExtendedPANID];
-    _cppThreadOperationalDataset.SetExtendedPanId(extendedPanId);
+    TEMPORARY_RETURN_IGNORED _cppThreadOperationalDataset.SetExtendedPanId(extendedPanId);
 
     if (![self _checkDataLength:self.masterKey expectedLength:MTRSizeThreadMasterKey]) {
         MTR_LOG_ERROR("Invalid MasterKey");
         return NO;
     }
     uint8_t masterKey[MTRSizeThreadMasterKey];
     [self.masterKey getBytes:&masterKey length:MTRSizeThreadMasterKey];
-    _cppThreadOperationalDataset.SetMasterKey(masterKey);
+    TEMPORARY_RETURN_IGNORED _cppThreadOperationalDataset.SetMasterKey(masterKey);
 
     if (![self _checkDataLength:self.PSKc expectedLength:MTRSizeThreadPSKc]) {
         MTR_LOG_ERROR("Invalid PKSc");
         return NO;
     }
     uint8_t PSKc[MTRSizeThreadPSKc];
     [self.PSKc getBytes:&PSKc length:MTRSizeThreadPSKc];
-    _cppThreadOperationalDataset.SetPSKc(PSKc);
+    TEMPORARY_RETURN_IGNORED _cppThreadOperationalDataset.SetPSKc(PSKc);
 
-    _cppThreadOperationalDataset.SetChannel([self.channelNumber unsignedShortValue]);
+    TEMPORARY_RETURN_IGNORED _cppThreadOperationalDataset.SetChannel([self.channelNumber unsignedShortValue]);
 
     // Thread's PAN ID is 2 bytes
     if (![self _checkDataLength:self.panID expectedLength:MTRSizeThreadPANID]) {
@@ -94,7 +94,7 @@ - (BOOL)_populateCppOperationalDataset
     uint16_t panID;
     memcpy(&panID, [self.panID bytes], MTRSizeThreadPANID);
     // The underlying CPP class assumes Big Endianness for the panID
-    _cppThreadOperationalDataset.SetPanId(CFSwapInt16HostToBig(panID));
+    TEMPORARY_RETURN_IGNORED _cppThreadOperationalDataset.SetPanId(CFSwapInt16HostToBig(panID));
 
     return YES;
 }
@@ -124,12 +124,12 @@ - (instancetype _Nullable)initWithData:(NSData *)data
     uint8_t masterKey[MTRSizeThreadMasterKey];
     uint16_t panID;
     uint16_t channel;
-    dataset.GetNetworkName(networkName);
-    dataset.GetExtendedPanId(extendedPANID);
-    dataset.GetMasterKey(masterKey);
-    dataset.GetPSKc(pskc);
-    dataset.GetPanId(panID);
-    dataset.GetChannel(channel);
+    TEMPORARY_RETURN_IGNORED dataset.GetNetworkName(networkName);
+    TEMPORARY_RETURN_IGNORED dataset.GetExtendedPanId(extendedPANID);
+    TEMPORARY_RETURN_IGNORED dataset.GetMasterKey(masterKey);
+    TEMPORARY_RETURN_IGNORED dataset.GetPSKc(pskc);
+    TEMPORARY_RETURN_IGNORED dataset.GetPanId(panID);
+    TEMPORARY_RETURN_IGNORED dataset.GetChannel(channel);
     panID = CFSwapInt16BigToHost(panID);
 
     return [self initWithNetworkName:[NSString stringWithUTF8String:networkName]
diff --git a/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerAccessControl.mm b/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerAccessControl.mm
@@ -132,7 +132,7 @@ bool GrantSubjectMatchesDescriptor(MTRAccessGrant * grant, const SubjectDescript
 struct ControllerAccessControl {
     DeviceTypeResolver mDeviceTypeResolver;
     AccessControlDelegate mDelegate;
-    ControllerAccessControl() { GetAccessControl().Init(&mDelegate, mDeviceTypeResolver); }
+    ControllerAccessControl() { TEMPORARY_RETURN_IGNORED GetAccessControl().Init(&mDelegate, mDeviceTypeResolver); }
 };
 
 Global<ControllerAccessControl> gControllerAccessControl;
diff --git a/src/platform/Darwin/PlatformManagerImpl.mm b/src/platform/Darwin/PlatformManagerImpl.mm
@@ -127,7 +127,7 @@
     {
         mRunLoopSem = dispatch_semaphore_create(0);
 
-        _StartEventLoopTask();
+        TEMPORARY_RETURN_IGNORED _StartEventLoopTask();
 
         //
         // Block on the semaphore till we're signalled to stop by
diff --git a/src/platform/Darwin/WiFi/ConfigurationManagerImplWiFi.cpp b/src/platform/Darwin/WiFi/ConfigurationManagerImplWiFi.cpp
@@ -47,8 +47,8 @@ CHIP_ERROR ConfigurationManagerImpl::ClearWiFiNetworkInformations()
 {
 #if !CHIP_DISABLE_PLATFORM_KVS
     auto & kvs = PersistedStorage::KeyValueStoreMgr();
-    kvs.Delete(kWiFiSSIDKeyName);
-    kvs.Delete(kWiFiCredentialsKeyName);
+    TEMPORARY_RETURN_IGNORED kvs.Delete(kWiFiSSIDKeyName);
+    TEMPORARY_RETURN_IGNORED kvs.Delete(kWiFiCredentialsKeyName);
     return CHIP_NO_ERROR;
 #endif
     return CHIP_ERROR_NOT_IMPLEMENTED;
diff --git a/src/platform/Darwin/WiFi/ConnectivityManagerImplWiFi.mm b/src/platform/Darwin/WiFi/ConnectivityManagerImplWiFi.mm
@@ -94,7 +94,7 @@
 
     void ConnectivityManagerImpl::_ClearWiFiStationProvision()
     {
-        ConfigurationManagerImpl::GetDefaultInstance().ClearWiFiNetworkInformations();
+        TEMPORARY_RETURN_IGNORED ConfigurationManagerImpl::GetDefaultInstance().ClearWiFiNetworkInformations();
     }
 
     CHIP_ERROR ConnectivityManagerImpl::GetWiFiInterfaceName(char * outName, size_t maxLen)
diff --git a/src/platform/Darwin/dnssd/DnssdContexts.cpp b/src/platform/Darwin/dnssd/DnssdContexts.cpp
@@ -348,7 +348,7 @@ void RegisterContext::DispatchFailure(const char * errorStr, CHIP_ERROR err)
 {
     ChipLogError(Discovery, "Mdns: Register failure (%s)", errorStr);
     callback(context, nullptr, nullptr, err);
-    MdnsContexts::GetInstance().Remove(this);
+    TEMPORARY_RETURN_IGNORED MdnsContexts::GetInstance().Remove(this);
 }
 
 void RegisterContext::DispatchSuccess()
@@ -382,7 +382,7 @@ void BrowseContext::DispatchFailure(const char * errorStr, CHIP_ERROR err)
         ChipLogError(Discovery, "Mdns: Browse failure (%s)", errorStr);
     }
     callback(context, nullptr, 0, true, err);
-    MdnsContexts::GetInstance().Remove(this);
+    TEMPORARY_RETURN_IGNORED MdnsContexts::GetInstance().Remove(this);
 }
 
 void BrowseContext::DispatchSuccess()
@@ -459,14 +459,14 @@ void BrowseWithDelegateContext::DispatchFailure(const char * errorStr, CHIP_ERRO
 
     auto delegate = static_cast<DnssdBrowseDelegate *>(context);
     delegate->OnBrowseStop(err);
-    MdnsContexts::GetInstance().Remove(this);
+    TEMPORARY_RETURN_IGNORED MdnsContexts::GetInstance().Remove(this);
 }
 
 void BrowseWithDelegateContext::DispatchSuccess()
 {
     auto delegate = static_cast<DnssdBrowseDelegate *>(context);
     delegate->OnBrowseStop(CHIP_NO_ERROR);
-    MdnsContexts::GetInstance().Remove(this);
+    TEMPORARY_RETURN_IGNORED MdnsContexts::GetInstance().Remove(this);
 }
 
 void BrowseWithDelegateContext::OnBrowse(DNSServiceFlags flags, const char * name, const char * type, const char * domain,
diff --git a/src/platform/Darwin/dnssd/DnssdImpl.cpp b/src/platform/Darwin/dnssd/DnssdImpl.cpp

Original file line number	Diff line number	Diff line change
`@@ -316,14 +316,14 @@ - (void)setOTAProviderDelegate:(id<MTROTAProviderDelegate>)otaProviderDelegate q`
`316`	`316`	`+ (nullable NSNumber *)nodeIDFromNOC:(MTRCertificateDERBytes)noc`
`317`	`317`	`{`
`318`	`318`	`NSNumber * nodeID = nil;`
`319`		`- ExtractNodeIDFromNOC(noc, &nodeID);`
	`319`	`+ TEMPORARY_RETURN_IGNORED ExtractNodeIDFromNOC(noc, &nodeID);`
`320`	`320`	`return nodeID;`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`+ (nullable NSNumber *)fabricIDFromNOC:(MTRCertificateDERBytes)noc`
`324`	`324`	`{`
`325`	`325`	`NSNumber * fabricID = nil;`
`326`		`- ExtractFabricIDFromNOC(noc, &fabricID);`
	`326`	`+ TEMPORARY_RETURN_IGNORED ExtractFabricIDFromNOC(noc, &fabricID);`
`327`	`327`	`return fabricID;`
`328`	`328`	`}`
`329`	`329`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ - (void)_controllerSuspended`
`359`	`359`	`auto * fabricTable = factory.fabricTable;`
`360`	`360`	`if (fabricTable) {`
`361`	`361`	`// We don't care about errors here. If our fabric is gone, nothing to do.`
`362`		`- fabricTable->SetShouldAdvertiseIdentity(self->_storedFabricIndex, chip::FabricTable::AdvertiseIdentity::No);`
	`362`	`+ TEMPORARY_RETURN_IGNORED fabricTable->SetShouldAdvertiseIdentity(self->_storedFabricIndex, chip::FabricTable::AdvertiseIdentity::No);`
`363`	`363`	`[factory resetOperationalAdvertising];`
`364`	`364`	`}`
`365`	`365`	`}`
`@@ -376,7 +376,7 @@ - (void)_controllerResumed`
`376`	`376`	`auto * fabricTable = factory.fabricTable;`
`377`	`377`	`if (fabricTable) {`
`378`	`378`	`// We don't care about errors here. If our fabric is gone, nothing to do.`
`379`		`- fabricTable->SetShouldAdvertiseIdentity(self->_storedFabricIndex, chip::FabricTable::AdvertiseIdentity::Yes);`
	`379`	`+ TEMPORARY_RETURN_IGNORED fabricTable->SetShouldAdvertiseIdentity(self->_storedFabricIndex, chip::FabricTable::AdvertiseIdentity::Yes);`
`380`	`380`	`[factory resetOperationalAdvertising];`
`381`	`381`	`}`
`382`	`382`	`}`