From 79f2e3046f26e171542fbdd4dd7441ef228ab69a Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Fri, 16 Sep 2016 16:04:58 -0700 Subject: [PATCH] Change VerifyOrExit to if-statement for readability. (#616) --- src/core/thread/network_data_local.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/core/thread/network_data_local.cpp b/src/core/thread/network_data_local.cpp index 12a4b5d58..a78a640f6 100644 --- a/src/core/thread/network_data_local.cpp +++ b/src/core/thread/network_data_local.cpp @@ -221,11 +221,13 @@ ThreadError Local::SendServerDataNotification(void) ThreadError error = kThreadError_None; uint16_t rloc = mMle.GetRloc16(); - VerifyOrExit((mMle.GetDeviceMode() & Mle::ModeTlv::kModeFFD) == 0 || - (mMle.IsRouterRoleEnabled() == false) || - (mMle.GetDeviceState() >= Mle::kDeviceStateRouter) || - (mMle.GetActiveRouterCount() >= mMle.GetRouterUpgradeThreshold()), - error = kThreadError_InvalidState); + if ((mMle.GetDeviceMode() & Mle::ModeTlv::kModeFFD) != 0 && + (mMle.IsRouterRoleEnabled()) && + (mMle.GetDeviceState() < Mle::kDeviceStateRouter) && + (mMle.GetActiveRouterCount() < mMle.GetRouterUpgradeThreshold())) + { + ExitNow(error = kThreadError_InvalidState); + } UpdateRloc();