From 5cd94ef93717368e7387fd81c98a1c16b60f0ba8 Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Thu, 9 Mar 2017 09:57:31 -0800 Subject: [PATCH] Use `return` instaed of `{}` after labels. (#1443) --- src/cli/cli_udp.cpp | 2 +- src/core/coap/coap_server.cpp | 2 +- src/core/mac/mac.cpp | 4 ++-- src/core/mac/mac_blacklist.cpp | 2 +- src/core/mac/mac_whitelist.cpp | 2 +- src/core/meshcop/dataset_manager.cpp | 2 +- src/core/net/dhcp6_client.cpp | 6 +++--- src/core/net/dhcp6_server.cpp | 4 ++-- src/core/thread/address_resolver.cpp | 4 ++-- src/core/thread/mesh_forwarder.cpp | 2 +- src/core/thread/mle.cpp | 4 ++-- src/core/thread/mle_router.cpp | 8 ++++---- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/cli/cli_udp.cpp b/src/cli/cli_udp.cpp index 3c3eb3244..e4edc0e25 100644 --- a/src/cli/cli_udp.cpp +++ b/src/cli/cli_udp.cpp @@ -93,7 +93,7 @@ void Udp::HandleUdpReceive(otMessage *aMessage, const otMessageInfo *aMessageInf mInterpreter->ProcessLine(buf, payloadLength, *this); exit: - {} + return; } int Udp::Output(const char *aBuf, uint16_t aBufLength) diff --git a/src/core/coap/coap_server.cpp b/src/core/coap/coap_server.cpp index ad4d9d5a9..1fe2382bc 100644 --- a/src/core/coap/coap_server.cpp +++ b/src/core/coap/coap_server.cpp @@ -191,7 +191,7 @@ void Server::ProcessReceivedMessage(Message &aMessage, const Ip6::MessageInfo &a } exit: - {} + return; } ThreadError Server::SetPort(uint16_t aPort) diff --git a/src/core/mac/mac.cpp b/src/core/mac/mac.cpp index 6c7b9be77..b00d40bf4 100644 --- a/src/core/mac/mac.cpp +++ b/src/core/mac/mac.cpp @@ -760,7 +760,7 @@ void Mac::ProcessTransmitSecurity(Frame &aFrame) aesCcm.Finalize(aFrame.GetFooter(), &tagLength); exit: - {} + return; } void Mac::HandleBeginTransmit(void) @@ -1106,7 +1106,7 @@ void Mac::SentFrame(ThreadError aError) } exit: - {} + return; } ThreadError Mac::ProcessReceiveSecurity(Frame &aFrame, const Address &aSrcAddr, Neighbor *aNeighbor) diff --git a/src/core/mac/mac_blacklist.cpp b/src/core/mac/mac_blacklist.cpp index b7be98724..966faa0dc 100644 --- a/src/core/mac/mac_blacklist.cpp +++ b/src/core/mac/mac_blacklist.cpp @@ -115,7 +115,7 @@ void Blacklist::Remove(const ExtAddress &address) memset(entry, 0, sizeof(*entry)); exit: - {} + return; } Blacklist::Entry *Blacklist::Find(const ExtAddress &address) diff --git a/src/core/mac/mac_whitelist.cpp b/src/core/mac/mac_whitelist.cpp index 8f2085f9b..796cfdef1 100644 --- a/src/core/mac/mac_whitelist.cpp +++ b/src/core/mac/mac_whitelist.cpp @@ -118,7 +118,7 @@ void Whitelist::Remove(const ExtAddress &address) memset(entry, 0, sizeof(*entry)); exit: - {} + return; } Whitelist::Entry *Whitelist::Find(const ExtAddress &address) diff --git a/src/core/meshcop/dataset_manager.cpp b/src/core/meshcop/dataset_manager.cpp index 2ba99299e..76cb80b9e 100644 --- a/src/core/meshcop/dataset_manager.cpp +++ b/src/core/meshcop/dataset_manager.cpp @@ -1151,7 +1151,7 @@ void PendingDatasetBase::ApplyActiveDataset(const Timestamp &aTimestamp, Message ResetDelayTimer(kFlagNetworkUpdated); exit: - {} + return; } void PendingDatasetBase::HandleNetworkUpdate(uint8_t &aFlags) diff --git a/src/core/net/dhcp6_client.cpp b/src/core/net/dhcp6_client.cpp index b6efc032e..fca28f250 100644 --- a/src/core/net/dhcp6_client.cpp +++ b/src/core/net/dhcp6_client.cpp @@ -219,7 +219,7 @@ void Dhcp6Client::AddIdentityAssociation(uint16_t aRloc16, otIp6Prefix &aIp6Pref } exit: - {} + return; } void Dhcp6Client::RemoveIdentityAssociation(uint16_t aRloc16, otIp6Prefix &aIp6Prefix) @@ -260,7 +260,7 @@ void Dhcp6Client::RemoveIdentityAssociation(uint16_t aRloc16, otIp6Prefix &aIp6P } exit: - {} + return; } ThreadError Dhcp6Client::Start(void) @@ -534,7 +534,7 @@ void Dhcp6Client::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &aM } exit: - {} + return; } void Dhcp6Client::ProcessReply(Message &aMessage) diff --git a/src/core/net/dhcp6_server.cpp b/src/core/net/dhcp6_server.cpp index f25520e51..f0d0f4b05 100644 --- a/src/core/net/dhcp6_server.cpp +++ b/src/core/net/dhcp6_server.cpp @@ -267,7 +267,7 @@ void Dhcp6Server::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &aM ProcessSolicit(aMessage, dst, header.GetTransactionId()); exit: - {} + return; } void Dhcp6Server::ProcessSolicit(Message &aMessage, otIp6Address &aDst, uint8_t *aTransactionId) @@ -301,7 +301,7 @@ void Dhcp6Server::ProcessSolicit(Message &aMessage, otIp6Address &aDst, uint8_t SuccessOrExit(SendReply(aDst, aTransactionId, clientIdentifier, iana)); exit: - {} + return; } uint16_t Dhcp6Server::FindOption(Message &aMessage, uint16_t aOffset, uint16_t aLength, Code aCode) diff --git a/src/core/thread/address_resolver.cpp b/src/core/thread/address_resolver.cpp index 1f87a848a..58ee0840a 100644 --- a/src/core/thread/address_resolver.cpp +++ b/src/core/thread/address_resolver.cpp @@ -486,7 +486,7 @@ void AddressResolver::HandleAddressError(Coap::Header &aHeader, Message &aMessag } exit: - {} + return; } void AddressResolver::HandleAddressQuery(void *aContext, otCoapHeader *aHeader, otMessage *aMessage, @@ -553,7 +553,7 @@ void AddressResolver::HandleAddressQuery(Coap::Header &aHeader, Message &aMessag } exit: - {} + return; } void AddressResolver::SendAddressQueryResponse(const ThreadTargetTlv &aTargetTlv, diff --git a/src/core/thread/mesh_forwarder.cpp b/src/core/thread/mesh_forwarder.cpp index cd9d7a12c..ad88abcf9 100644 --- a/src/core/thread/mesh_forwarder.cpp +++ b/src/core/thread/mesh_forwarder.cpp @@ -2193,7 +2193,7 @@ void MeshForwarder::HandleDataRequest(const Mac::Address &aMacSource, const Thre mScheduleTransmissionTask.Post(); exit: - {} + return; } void MeshForwarder::HandleDataPollTimeout(void *aContext) diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index a12ea8e6f..4550a4105 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -1250,7 +1250,7 @@ void Mle::HandleNetifStateChanged(uint32_t aFlags) } exit: - {} + return; } void Mle::HandleParentRequestTimer(void *aContext) @@ -2209,7 +2209,7 @@ void Mle::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &aMessageIn } exit: - {} + return; } ThreadError Mle::HandleAdvertisement(const Message &aMessage, const Ip6::MessageInfo &aMessageInfo) diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index 147372dcb..62eda9b51 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -1863,7 +1863,7 @@ void MleRouter::HandleStateUpdateTimer(void) mStateUpdateTimer.Start(kStateUpdatePeriod); exit: - {} + return; } void MleRouter::HandleChildUpdateRequestTimer(void *aContext) @@ -1893,7 +1893,7 @@ void MleRouter::HandleChildUpdateRequestTimer(void) } exit: - {} + return; } ThreadError MleRouter::SendParentResponse(Child *aChild, const ChallengeTlv &challenge, bool aRoutersOnlyRequest) @@ -3847,7 +3847,7 @@ void MleRouter::HandleAddressSolicitResponse(Coap::Header *aHeader, Message *aMe } exit: - {} + return; } void MleRouter::HandleAddressSolicit(void *aContext, otCoapHeader *aHeader, otMessage *aMessage, @@ -4053,7 +4053,7 @@ void MleRouter::HandleAddressRelease(Coap::Header &aHeader, Message &aMessage, otLogInfoMle(GetInstance(), "Sent address release response"); exit: - {} + return; } void MleRouter::FillConnectivityTlv(ConnectivityTlv &aTlv)