espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-05 00:30:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[network-data] change RemoveCommissioningData() to return void (#4941)

Browse Source
This commit is contained in:
Jonathan Hui
2020-05-11 12:44:54 -07:00
parent e55906c5eb
commit 4f05c99e17
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/network_data_leader.cpp
+5 -6
View File
@@ -455,7 +455,7 @@ otError LeaderBase::SetCommissioningData(const uint8_t *aValue, uint8_t aValueLe
otError error = OT_ERROR_NONE;
CommissioningDataTlv *commissioningDataTlv;
IgnoreError(RemoveCommissioningData());
RemoveCommissioningData();
if (aValueLength > 0)
{
@@ -517,16 +517,15 @@ exit:
return rval;
}
otError LeaderBase::RemoveCommissioningData(void)
void LeaderBase::RemoveCommissioningData(void)
{
otError error = OT_ERROR_NONE;
CommissioningDataTlv *tlv = GetCommissioningData();
CommissioningDataTlv *tlv = GetCommissioningData();
VerifyOrExit(tlv != NULL, error = OT_ERROR_NOT_FOUND);
VerifyOrExit(tlv != NULL, OT_NOOP);
RemoveTlv(tlv);
exit:
return error;
return;
}
} // namespace NetworkData
src/core/thread/network_data_leader.hpp
+1 -1
View File
@@ -296,7 +296,7 @@ protected:
private:
const PrefixTlv *FindNextMatchingPrefix(const Ip6::Address &aAddress, const PrefixTlv *aPrevTlv) const;
otError RemoveCommissioningData(void);
void RemoveCommissioningData(void);
otError ExternalRouteLookup(uint8_t aDomainId,
const Ip6::Address &aDestination,