From 4f05c99e17aff299730bc9a048855f09d8249467 Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@google.com>
Date: Fri, 8 May 2020 17:25:11 -0700
Subject: [PATCH] [network-data] change RemoveCommissioningData() to return
 void (#4941)

---
 src/core/thread/network_data_leader.cpp | 11 +++++------
 src/core/thread/network_data_leader.hpp |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/core/thread/network_data_leader.cpp b/src/core/thread/network_data_leader.cpp
index 5095b4c77..be6eb384f 100644
--- a/src/core/thread/network_data_leader.cpp
+++ b/src/core/thread/network_data_leader.cpp
@@ -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
diff --git a/src/core/thread/network_data_leader.hpp b/src/core/thread/network_data_leader.hpp
index 6a922925e..153738b8b 100644
--- a/src/core/thread/network_data_leader.hpp
+++ b/src/core/thread/network_data_leader.hpp
@@ -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,