From 972acd734ffc960f0420a0c02bd148569efbdbe1 Mon Sep 17 00:00:00 2001 From: Seth Rickard Date: Tue, 28 Apr 2020 18:07:43 -0500 Subject: [PATCH] [build] add unused code macros after asserts (#4885) This change is to address some warninings present on the ti-cgt toolchain. Code after a while(true) loop or an unconditional jump results in a dead code warning. --- src/cli/cli_coap.cpp | 2 +- src/core/api/thread_ftd_api.cpp | 2 +- src/core/coap/coap.cpp | 2 +- .../config/openthread-core-config-check.h | 4 +++ src/core/mac/data_poll_handler.cpp | 2 +- src/core/mac/mac.cpp | 10 +++---- src/core/mac/mac_frame.cpp | 8 ++--- src/core/mac/sub_mac.cpp | 2 +- src/core/meshcop/dtls.cpp | 6 ++-- src/core/meshcop/joiner.cpp | 2 +- src/core/thread/indirect_sender.cpp | 4 +-- src/core/thread/mle.cpp | 8 ++--- src/core/thread/mle_router.cpp | 16 +++++----- src/core/thread/network_data_local.cpp | 6 ++-- src/core/thread/network_data_notifier.cpp | 4 +-- src/core/thread/network_diagnostic.cpp | 30 +++++++++---------- src/lib/spinel/spinel.c | 2 +- src/lib/spinel/spinel_buffer.cpp | 4 +-- src/ncp/ncp_base.cpp | 4 +-- 19 files changed, 61 insertions(+), 57 deletions(-) diff --git a/src/cli/cli_coap.cpp b/src/cli/cli_coap.cpp index 33830d579..7c9c0a7fe 100644 --- a/src/cli/cli_coap.cpp +++ b/src/cli/cli_coap.cpp @@ -201,7 +201,7 @@ otError Coap::ProcessResource(uint8_t aArgsLength, char *aArgs[]) } exit: - return OT_ERROR_NONE; + return error; } otError Coap::ProcessSet(uint8_t aArgsLength, char *aArgs[]) diff --git a/src/core/api/thread_ftd_api.cpp b/src/core/api/thread_ftd_api.cpp index 34969f611..94d64ea53 100644 --- a/src/core/api/thread_ftd_api.cpp +++ b/src/core/api/thread_ftd_api.cpp @@ -363,7 +363,7 @@ int8_t otThreadGetParentPriority(otInstance *aInstance) return instance.Get().GetAssignParentPriority(); } -otError otThreadSetParentPriority(otInstance *aInstance, const int8_t aParentPriority) +otError otThreadSetParentPriority(otInstance *aInstance, int8_t aParentPriority) { Instance &instance = *static_cast(aInstance); diff --git a/src/core/coap/coap.cpp b/src/core/coap/coap.cpp index e85052f5f..4e95abc03 100644 --- a/src/core/coap/coap.cpp +++ b/src/core/coap/coap.cpp @@ -309,7 +309,7 @@ otError CoapBase::SendHeaderResponse(Message::Code aCode, const Message &aReques default: ExitNow(error = OT_ERROR_INVALID_ARGS); - break; + OT_UNREACHABLE_CODE(break); } SuccessOrExit(error = message->SetToken(aRequest.GetToken(), aRequest.GetTokenLength())); diff --git a/src/core/config/openthread-core-config-check.h b/src/core/config/openthread-core-config-check.h index 2338fcf1a..e4e16922b 100644 --- a/src/core/config/openthread-core-config-check.h +++ b/src/core/config/openthread-core-config-check.h @@ -42,6 +42,10 @@ #error "OPENTHREAD_ENABLE_DHCP6_MULTICAST_SOLICIT requires OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE to be also set." #endif +#if OPENTHREAD_ENABLE_DHCP6_MULTICAST_SOLICIT && OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE +#error "OPENTHREAD_ENABLE_DHCP6_MULTICAST_SOLICIT requires DHCPv6 server on Border Router side to be enabled." +#endif + #if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE #if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE #error "Dynamic log level is not supported along with multiple OT instance feature" diff --git a/src/core/mac/data_poll_handler.cpp b/src/core/mac/data_poll_handler.cpp index 2fc06cd6c..9b0728e46 100644 --- a/src/core/mac/data_poll_handler.cpp +++ b/src/core/mac/data_poll_handler.cpp @@ -278,7 +278,7 @@ void DataPollHandler::HandleSentFrame(const Mac::TxFrame &aFrame, otError aError default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } mCallbacks.HandleSentFrameToChild(aFrame, mFrameContext, aError, aChild); diff --git a/src/core/mac/mac.cpp b/src/core/mac/mac.cpp index e63be4069..ce7b39e13 100644 --- a/src/core/mac/mac.cpp +++ b/src/core/mac/mac.cpp @@ -1005,7 +1005,7 @@ void Mac::ProcessTransmitSecurity(TxFrame &aFrame, bool aProcessAesCcm) default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } if (aProcessAesCcm) @@ -1084,7 +1084,7 @@ void Mac::BeginTransmit(void) default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } #if OPENTHREAD_CONFIG_TIME_SYNC_ENABLE @@ -1381,7 +1381,7 @@ void Mac::HandleTransmitDone(TxFrame &aFrame, RxFrame *aAckFrame, otError aError default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } exit: @@ -1422,7 +1422,7 @@ void Mac::HandleTimer(void) default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } } @@ -1513,7 +1513,7 @@ otError Mac::ProcessReceiveSecurity(RxFrame &aFrame, const Address &aSrcAddr, Ne default: ExitNow(); - break; + OT_UNREACHABLE_CODE(break); } KeyManager::GenerateNonce(*extAddress, frameCounter, securityLevel, nonce); diff --git a/src/core/mac/mac_frame.cpp b/src/core/mac/mac_frame.cpp index 10cabb07b..aefbda1f9 100644 --- a/src/core/mac/mac_frame.cpp +++ b/src/core/mac/mac_frame.cpp @@ -245,7 +245,7 @@ void Frame::SetDstAddr(const Address &aAddress) default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } } @@ -423,7 +423,7 @@ void Frame::SetSrcAddr(const Address &aAddress) default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } } @@ -802,7 +802,7 @@ uint8_t Frame::CalculateAddrFieldSize(uint16_t aFcf) default: ExitNow(size = kInvalidSize); - break; + OT_UNREACHABLE_CODE(break); } if (IsSrcPanIdPresent(aFcf)) @@ -825,7 +825,7 @@ uint8_t Frame::CalculateAddrFieldSize(uint16_t aFcf) default: ExitNow(size = kInvalidSize); - break; + OT_UNREACHABLE_CODE(break); } exit: diff --git a/src/core/mac/sub_mac.cpp b/src/core/mac/sub_mac.cpp index ac1f991f3..eedbabf46 100644 --- a/src/core/mac/sub_mac.cpp +++ b/src/core/mac/sub_mac.cpp @@ -207,7 +207,7 @@ otError SubMac::Send(void) case kStateTransmit: case kStateEnergyScan: ExitNow(error = OT_ERROR_INVALID_STATE); - break; + OT_UNREACHABLE_CODE(break); case kStateSleep: case kStateReceive: diff --git a/src/core/meshcop/dtls.cpp b/src/core/meshcop/dtls.cpp index 096e69d4d..36f29191f 100644 --- a/src/core/meshcop/dtls.cpp +++ b/src/core/meshcop/dtls.cpp @@ -780,7 +780,7 @@ void Dtls::HandleTimer(void) default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } } @@ -826,7 +826,7 @@ void Dtls::Process(void) case MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY: mbedtls_ssl_close_notify(&mSsl); ExitNow(shouldDisconnect = true); - break; + OT_UNREACHABLE_CODE(break); case MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED: break; @@ -834,7 +834,7 @@ void Dtls::Process(void) case MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE: mbedtls_ssl_close_notify(&mSsl); ExitNow(shouldDisconnect = true); - break; + OT_UNREACHABLE_CODE(break); case MBEDTLS_ERR_SSL_INVALID_MAC: if (mSsl.state != MBEDTLS_SSL_HANDSHAKE_OVER) diff --git a/src/core/meshcop/joiner.cpp b/src/core/meshcop/joiner.cpp index 84d61efb9..49747f68c 100644 --- a/src/core/meshcop/joiner.cpp +++ b/src/core/meshcop/joiner.cpp @@ -598,7 +598,7 @@ void Joiner::HandleTimer(void) case OT_JOINER_STATE_DISCOVER: case OT_JOINER_STATE_CONNECT: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); case OT_JOINER_STATE_CONNECTED: case OT_JOINER_STATE_ENTRUST: diff --git a/src/core/thread/indirect_sender.cpp b/src/core/thread/indirect_sender.cpp index 7c491908d..7c93f5f6e 100644 --- a/src/core/thread/indirect_sender.cpp +++ b/src/core/thread/indirect_sender.cpp @@ -345,7 +345,7 @@ otError IndirectSender::PrepareFrameForChild(Mac::TxFrame &aFrame, FrameContext default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } exit: @@ -467,7 +467,7 @@ void IndirectSender::HandleSentFrameToChild(const Mac::TxFrame &aFrame, default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } if ((message != NULL) && (nextOffset < message->GetLength())) diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index ee40273a0..5d45dc38c 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -1703,7 +1703,7 @@ void Mle::HandleAttachTimer(void) { case kAttachStateIdle: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); case kAttachStateProcessAnnounce: ProcessAnnounce(); @@ -2315,7 +2315,7 @@ otError Mle::SendChildUpdateRequest(void) case kRoleRouter: case kRoleLeader: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } destination.SetToLinkLocalAddress(mParent.GetExtAddress()); @@ -3638,7 +3638,7 @@ otError Mle::HandleChildUpdateResponse(const Message & aMessage, default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } // Status @@ -3717,7 +3717,7 @@ otError Mle::HandleChildUpdateResponse(const Message & aMessage, default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } exit: diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index 56e548403..1f26ae979 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -168,7 +168,7 @@ otError MleRouter::BecomeRouter(ThreadStatusTlv::Status aStatus) default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } exit: @@ -445,7 +445,7 @@ otError MleRouter::SendAdvertisement(void) case kRoleDisabled: case kRoleDetached: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); case kRoleChild: break; @@ -490,7 +490,7 @@ otError MleRouter::SendLinkRequest(Neighbor *aNeighbor) { case kRoleDisabled: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); case kRoleDetached: SuccessOrExit(error = AppendTlvRequest(*message, detachedTlvs, sizeof(detachedTlvs))); @@ -906,7 +906,7 @@ otError MleRouter::HandleLinkAccept(const Message & aMessage, { case kRoleDisabled: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); case kRoleDetached: // Address16 @@ -1756,7 +1756,7 @@ void MleRouter::HandleStateUpdateTimer(void) { case kRoleDisabled: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); case kRoleDetached: if (mChallengeTimeout == 0) @@ -1840,7 +1840,7 @@ void MleRouter::HandleStateUpdateTimer(void) case Neighbor::kStateParentResponse: case Neighbor::kStateLinkRequest: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } if (TimerMilli::GetNow() - child.GetLastHeard() >= timeout) @@ -2291,7 +2291,7 @@ otError MleRouter::HandleChildIdRequest(const Message & aMessage, case kRoleDisabled: case kRoleDetached: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); case kRoleChild: child->SetState(Neighbor::kStateChildIdRequest); @@ -4163,7 +4163,7 @@ void MleRouter::HandleAddressSolicit(Coap::Message &aMessage, const Ip6::Message default: ExitNow(error = OT_ERROR_PARSE); - break; + OT_UNREACHABLE_CODE(break); } switch (Tlv::ReadUint16Tlv(aMessage, ThreadTlv::kRloc16, rloc16)) diff --git a/src/core/thread/network_data_local.cpp b/src/core/thread/network_data_local.cpp index ca47e09b6..99e9f7a8c 100644 --- a/src/core/thread/network_data_local.cpp +++ b/src/core/thread/network_data_local.cpp @@ -221,7 +221,7 @@ void Local::UpdateRloc(PrefixTlv &aPrefix) default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } } } @@ -311,7 +311,7 @@ void Local::UpdateRloc(ServiceTlv &aService) default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } } } @@ -345,7 +345,7 @@ void Local::UpdateRloc(void) default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } } } diff --git a/src/core/thread/network_data_notifier.cpp b/src/core/thread/network_data_notifier.cpp index 5d1144ed8..d760b2728 100644 --- a/src/core/thread/network_data_notifier.cpp +++ b/src/core/thread/network_data_notifier.cpp @@ -97,7 +97,7 @@ exit: break; default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } } @@ -157,7 +157,7 @@ void Notifier::HandleCoapResponse(otError aResult) default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } } diff --git a/src/core/thread/network_diagnostic.cpp b/src/core/thread/network_diagnostic.cpp index 0ff85efc1..d9664c27e 100644 --- a/src/core/thread/network_diagnostic.cpp +++ b/src/core/thread/network_diagnostic.cpp @@ -820,7 +820,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, aNetworkDiagTlv.mData.mExtAddress = *extMacAddr.GetMacAddr(); ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } case NetworkDiagnosticTlv::kAddress16: @@ -833,7 +833,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, aNetworkDiagTlv.mData.mAddr16 = addr16.GetRloc16(); ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } case NetworkDiagnosticTlv::kMode: @@ -846,7 +846,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, ParseMode(linkMode.GetMode(), aNetworkDiagTlv.mData.mMode); ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } case NetworkDiagnosticTlv::kTimeout: @@ -859,7 +859,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, aNetworkDiagTlv.mData.mTimeout = timeout.GetTimeout(); ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } case NetworkDiagnosticTlv::kConnectivity: @@ -872,7 +872,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, ParseConnectivity(connectivity, aNetworkDiagTlv.mData.mConnectivity); ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } case NetworkDiagnosticTlv::kRoute: @@ -886,7 +886,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, ParseRoute(route, aNetworkDiagTlv.mData.mRoute); ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } case NetworkDiagnosticTlv::kLeaderData: @@ -899,7 +899,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, ParseLeaderData(leaderData, aNetworkDiagTlv.mData.mLeaderData); ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } case NetworkDiagnosticTlv::kNetworkData: @@ -915,7 +915,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, memcpy(aNetworkDiagTlv.mData.mNetworkData.m8, networkData.GetNetworkData(), networkData.GetLength()); aNetworkDiagTlv.mData.mNetworkData.mCount = networkData.GetLength(); ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } case NetworkDiagnosticTlv::kIp6AddressList: @@ -930,7 +930,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, aNetworkDiagTlv.mData.mIp6AddrList.mCount = ip6AddrList.GetLength() / OT_IP6_ADDRESS_SIZE; ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } case NetworkDiagnosticTlv::kMacCounters: @@ -943,7 +943,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, ParseMacCounters(macCounters, aNetworkDiagTlv.mData.mMacCounters); ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } case NetworkDiagnosticTlv::kBatteryLevel: @@ -956,7 +956,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, aNetworkDiagTlv.mData.mBatteryLevel = batteryLevel.GetBatteryLevel(); ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } case NetworkDiagnosticTlv::kSupplyVoltage: @@ -969,7 +969,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, aNetworkDiagTlv.mData.mSupplyVoltage = supplyVoltage.GetSupplyVoltage(); ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } case NetworkDiagnosticTlv::kChildTable: @@ -988,7 +988,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, } aNetworkDiagTlv.mData.mChildTable.mCount = childTable.GetNumEntries(); ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } case NetworkDiagnosticTlv::kChannelPages: @@ -1000,7 +1000,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, aNetworkDiagTlv.mData.mChannelPages.mCount = tlv.GetLength(); ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } case NetworkDiagnosticTlv::kMaxChildTimeout: @@ -1013,7 +1013,7 @@ otError NetworkDiagnostic::GetNextDiagTlv(const otMessage & aMessage, aNetworkDiagTlv.mData.mMaxChildTimeout = maxChildTimeout.GetTimeout(); ExitNow(error = OT_ERROR_NONE); - break; + OT_UNREACHABLE_CODE(break); } default: diff --git a/src/lib/spinel/spinel.c b/src/lib/spinel/spinel.c index c09fcd57f..23255a3a6 100644 --- a/src/lib/spinel/spinel.c +++ b/src/lib/spinel/spinel.c @@ -54,7 +54,7 @@ */ #include #include -#include +#include "utils/wrap_string.h" #endif // #ifndef SPINEL_PLATFORM_HEADER // ---------------------------------------------------------------------------- diff --git a/src/lib/spinel/spinel_buffer.cpp b/src/lib/spinel/spinel_buffer.cpp index 09990479d..529995de5 100644 --- a/src/lib/spinel/spinel_buffer.cpp +++ b/src/lib/spinel/spinel_buffer.cpp @@ -153,7 +153,7 @@ uint8_t *Buffer::GetUpdatedBufPtr(uint8_t *aBufPtr, uint16_t aOffset, Direction case kUnknown: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } return ptr; @@ -196,7 +196,7 @@ uint16_t Buffer::GetDistance(const uint8_t *aStartPtr, const uint8_t *aEndPtr, D case kUnknown: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } return static_cast(distance); diff --git a/src/ncp/ncp_base.cpp b/src/ncp/ncp_base.cpp index c199b835e..5253d2551 100644 --- a/src/ncp/ncp_base.cpp +++ b/src/ncp/ncp_base.cpp @@ -1035,7 +1035,7 @@ otError NcpBase::HandleCommandPropertyInsertRemove(uint8_t aHeader, spinel_prop_ default: OT_ASSERT(false); - break; + OT_UNREACHABLE_CODE(break); } VerifyOrExit(handler != NULL, error = PrepareLastStatusResponse(aHeader, SPINEL_STATUS_PROP_NOT_FOUND)); @@ -2250,7 +2250,7 @@ template <> otError NcpBase::HandlePropertySet( default: ExitNow(error = OT_ERROR_INVALID_ARGS); - break; + OT_UNREACHABLE_CODE(break); } otLoggingSetLevel(logLevel);