espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-12 05:37:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] add unused code macros after asserts (#4885)

Browse Source 
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.
This commit is contained in:
Seth Rickard
2020-04-28 16:07:43 -07:00
committed by GitHub
parent 80285206d2
commit 972acd734f
19 changed files with 61 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/cli_coap.cpp
+1 -1
View File
@@ -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[])
src/core/api/thread_ftd_api.cpp
+1 -1
View File
@@ -363,7 +363,7 @@ int8_t otThreadGetParentPriority(otInstance *aInstance)
return instance.Get<Mle::MleRouter>().GetAssignParentPriority();
}
otError otThreadSetParentPriority(otInstance *aInstance, const int8_t aParentPriority)
otError otThreadSetParentPriority(otInstance *aInstance, int8_t aParentPriority)
{
Instance &instance = *static_cast<Instance *>(aInstance);
src/core/coap/coap.cpp
+1 -1
View File
@@ -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()));
src/core/config/openthread-core-config-check.h
+4
View File
@@ -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"
src/core/mac/data_poll_handler.cpp
+1 -1
View File
@@ -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);
src/core/mac/mac.cpp
+5 -5
View File
@@ -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);
src/core/mac/mac_frame.cpp
+4 -4
View File
@@ -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:
src/core/mac/sub_mac.cpp
+1 -1
View File
@@ -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:
src/core/meshcop/dtls.cpp
+3 -3
View File
@@ -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)
src/core/meshcop/joiner.cpp
+1 -1
View File
@@ -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:
src/core/thread/indirect_sender.cpp
+2 -2
View File
@@ -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()))
src/core/thread/mle.cpp
+4 -4
View File
@@ -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:
src/core/thread/mle_router.cpp
+8 -8
View File
@@ -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))
src/core/thread/network_data_local.cpp
+3 -3
View File
@@ -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);
}
}
}
src/core/thread/network_data_notifier.cpp
+2 -2
View File
@@ -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);
}
}
src/core/thread/network_diagnostic.cpp
+15 -15
View File
@@ -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:
src/lib/spinel/spinel.c
+1 -1
View File
@@ -54,7 +54,7 @@
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "utils/wrap_string.h"
#endif // #ifndef SPINEL_PLATFORM_HEADER
// ----------------------------------------------------------------------------
src/lib/spinel/spinel_buffer.cpp
+2 -2
View File
@@ -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<uint16_t>(distance);
src/ncp/ncp_base.cpp
+2 -2
View File
@@ -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<SPINEL_PROP_DEBUG_NCP_LOG_LEVEL>(
default:
ExitNow(error = OT_ERROR_INVALID_ARGS);
break;
OT_UNREACHABLE_CODE(break);
}
otLoggingSetLevel(logLevel);