From 034e5ad03efe14839c088e8a627af27cdcf83ac0 Mon Sep 17 00:00:00 2001 From: Yakun Xu Date: Wed, 24 Oct 2018 00:55:30 +0800 Subject: [PATCH] [coverage] remove empty functions (#3179) --- src/core/Makefile.am | 1 - src/core/meshcop/dataset_manager.cpp | 10 ++-- src/core/thread/mesh_forwarder.cpp | 8 +++ src/core/thread/mesh_forwarder_mtd.cpp | 30 ---------- src/core/thread/network_data_leader.hpp | 6 +- src/core/thread/network_data_leader_mtd.hpp | 65 --------------------- 6 files changed, 18 insertions(+), 102 deletions(-) delete mode 100644 src/core/thread/network_data_leader_mtd.hpp diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 71a065b68..77daed6c7 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -333,7 +333,6 @@ HEADERS_COMMON = \ thread/network_data.hpp \ thread/network_data_leader.hpp \ thread/network_data_leader_ftd.hpp \ - thread/network_data_leader_mtd.hpp \ thread/network_data_local.hpp \ thread/network_data_tlvs.hpp \ thread/network_diagnostic.hpp \ diff --git a/src/core/meshcop/dataset_manager.cpp b/src/core/meshcop/dataset_manager.cpp index 80c971ad8..b864e8312 100644 --- a/src/core/meshcop/dataset_manager.cpp +++ b/src/core/meshcop/dataset_manager.cpp @@ -168,15 +168,15 @@ otError DatasetManager::Set(const Dataset &aDataset) if (isMasterkeyUpdated || compare > 0) { - ThreadNetif &netif = GetNetif(); - mLocal.Set(aDataset); - if (netif.GetMle().GetRole() == OT_DEVICE_ROLE_LEADER) +#if OPENTHREAD_FTD + if (GetNetif().GetMle().GetRole() == OT_DEVICE_ROLE_LEADER) { - netif.GetNetworkDataLeader().IncrementVersion(); - netif.GetNetworkDataLeader().IncrementStableVersion(); + GetNetif().GetNetworkDataLeader().IncrementVersion(); + GetNetif().GetNetworkDataLeader().IncrementStableVersion(); } +#endif } else if (compare < 0) { diff --git a/src/core/thread/mesh_forwarder.cpp b/src/core/thread/mesh_forwarder.cpp index 1baa93b01..0fb1dc5fb 100644 --- a/src/core/thread/mesh_forwarder.cpp +++ b/src/core/thread/mesh_forwarder.cpp @@ -147,10 +147,12 @@ exit: void MeshForwarder::RemoveMessage(Message &aMessage) { +#if OPENTHREAD_FTD for (ChildTable::Iterator iter(GetInstance(), ChildTable::kInStateAnyExceptInvalid); !iter.IsDone(); iter++) { IgnoreReturnValue(RemoveMessageFromSleepyChild(aMessage, *iter.GetChild())); } +#endif if (mSendMessage == &aMessage) { @@ -173,10 +175,12 @@ void MeshForwarder::ScheduleTransmissionTask(void) mSendMessageIsARetransmission = false; +#if OPENTHREAD_FTD if (GetIndirectTransmission() == OT_ERROR_NONE) { ExitNow(); } +#endif // OPENTHREAD_FTD if ((mSendMessage = GetDirectTransmission()) != NULL) { @@ -1045,7 +1049,9 @@ void MeshForwarder::HandleSentFrame(Mac::Frame &aFrame, otError aError) } } +#if OPENTHREAD_FTD HandleSentFrameToChild(aFrame, aError, macDest); +#endif VerifyOrExit(mSendMessage != NULL); @@ -1250,7 +1256,9 @@ void MeshForwarder::HandleReceivedFrame(Mac::Frame &aFrame) if (payloadLength >= sizeof(Lowpan::MeshHeader) && reinterpret_cast(payload)->IsMeshHeader()) { +#if OPENTHREAD_FTD HandleMesh(payload, payloadLength, macSource, linkInfo); +#endif } else if (payloadLength >= sizeof(Lowpan::FragmentHeader) && reinterpret_cast(payload)->IsFragmentHeader()) diff --git a/src/core/thread/mesh_forwarder_mtd.cpp b/src/core/thread/mesh_forwarder_mtd.cpp index e38a7a485..5235af6a3 100644 --- a/src/core/thread/mesh_forwarder_mtd.cpp +++ b/src/core/thread/mesh_forwarder_mtd.cpp @@ -71,36 +71,6 @@ exit: return error; } -otError MeshForwarder::GetIndirectTransmission(void) -{ - return OT_ERROR_NOT_FOUND; -} - -otError MeshForwarder::RemoveMessageFromSleepyChild(Message &aMessage, Child &aChild) -{ - OT_UNUSED_VARIABLE(aMessage); - OT_UNUSED_VARIABLE(aChild); - return OT_ERROR_NOT_FOUND; -} - -void MeshForwarder::HandleSentFrameToChild(const Mac::Frame &aFrame, otError aError, const Mac::Address &aMacDest) -{ - OT_UNUSED_VARIABLE(aFrame); - OT_UNUSED_VARIABLE(aError); - OT_UNUSED_VARIABLE(aMacDest); -} - -void MeshForwarder::HandleMesh(uint8_t * aFrame, - uint8_t aFrameLength, - const Mac::Address & aMacSource, - const otThreadLinkInfo &aLinkInfo) -{ - OT_UNUSED_VARIABLE(aFrame); - OT_UNUSED_VARIABLE(aFrameLength); - OT_UNUSED_VARIABLE(aMacSource); - OT_UNUSED_VARIABLE(aLinkInfo); -} - } // namespace ot #endif // OPENTHREAD_MTD diff --git a/src/core/thread/network_data_leader.hpp b/src/core/thread/network_data_leader.hpp index 7a8976ff3..d7ccf9088 100644 --- a/src/core/thread/network_data_leader.hpp +++ b/src/core/thread/network_data_leader.hpp @@ -253,7 +253,11 @@ private: } // namespace ot #if OPENTHREAD_MTD -#include "network_data_leader_mtd.hpp" +namespace ot { +namespace NetworkData { +typedef class LeaderBase Leader; +} // namespace NetworkData +} // namespace ot #elif OPENTHREAD_FTD #include "network_data_leader_ftd.hpp" #else diff --git a/src/core/thread/network_data_leader_mtd.hpp b/src/core/thread/network_data_leader_mtd.hpp deleted file mode 100644 index a90309457..000000000 --- a/src/core/thread/network_data_leader_mtd.hpp +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2016, The OpenThread Authors. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file - * This file includes definitions for manipulating Thread Network Data managed by the Thread Leader. - */ - -#ifndef NETWORK_DATA_LEADER_MTD_HPP_ -#define NETWORK_DATA_LEADER_MTD_HPP_ - -#include "openthread-core-config.h" - -#include "utils/wrap_stdint.h" - -namespace ot { - -namespace NetworkData { - -class Leader : public LeaderBase -{ -public: - explicit Leader(Instance &aInstance) - : LeaderBase(aInstance) - { - } - - void Start(void) {} - void Stop(void) {} - - void IncrementVersion(void) {} - void IncrementStableVersion(void) {} - - otError SendServerDataNotification(uint16_t) { return OT_ERROR_NOT_IMPLEMENTED; } -}; - -} // namespace NetworkData -} // namespace ot - -#endif // NETWORK_DATA_LEADER_MTD_HPP_