From 07120a8a541871803857dbc945b17c7fed10b08f Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Fri, 8 May 2020 15:38:24 -0700 Subject: [PATCH] [mle] change RefreshStoredChildren() to return void (#4941) --- src/core/thread/mle_router.cpp | 12 +++++------- src/core/thread/mle_router.hpp | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index fb00df5c4..849d4815b 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -3687,7 +3687,7 @@ exit: // children info to ensure that the non-volatile settings remain // consistent with the child table. - IgnoreError(RefreshStoredChildren()); + RefreshStoredChildren(); } } @@ -3724,19 +3724,17 @@ otError MleRouter::StoreChild(const Child &aChild) return Get().AddChildInfo(childInfo); } -otError MleRouter::RefreshStoredChildren(void) +void MleRouter::RefreshStoredChildren(void) { - otError error = OT_ERROR_NONE; - - SuccessOrExit(error = Get().DeleteChildInfo()); + SuccessOrExit(Get().DeleteChildInfo()); for (ChildTable::Iterator iter(GetInstance(), Child::kInStateAnyExceptInvalid); !iter.IsDone(); iter++) { - SuccessOrExit(error = StoreChild(*iter.GetChild())); + SuccessOrExit(StoreChild(*iter.GetChild())); } exit: - return error; + return; } otError MleRouter::GetChildInfo(Child &aChild, otChildInfo &aChildInfo) diff --git a/src/core/thread/mle_router.hpp b/src/core/thread/mle_router.hpp index cdeaca143..593f1cb45 100644 --- a/src/core/thread/mle_router.hpp +++ b/src/core/thread/mle_router.hpp @@ -723,7 +723,7 @@ private: otError AppendPendingDataset(Message &aMessage); otError GetChildInfo(Child &aChild, otChildInfo &aChildInfo); void GetNeighborInfo(Neighbor &aNeighbor, otNeighborInfo &aNeighInfo); - otError RefreshStoredChildren(void); + void RefreshStoredChildren(void); void HandleDetachStart(void); void HandleChildStart(AttachMode aMode); void HandleLinkRequest(const Message &aMessage, const Ip6::MessageInfo &aMessageInfo, Neighbor *aNeighbor);