From cf5f5ee08bb389a7514a12b754b2df7d08e6aeba Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Tue, 20 Oct 2020 10:44:50 -0700 Subject: [PATCH] [clang-tidy] apply readability-make-member-function-const (#5675) --- src/core/common/timer.cpp | 2 +- src/core/common/timer.hpp | 2 +- src/core/meshcop/joiner_router.hpp | 2 +- src/core/net/ip6_mpl.hpp | 2 +- src/core/thread/csl_tx_scheduler.cpp | 2 +- src/core/thread/csl_tx_scheduler.hpp | 2 +- src/core/thread/mle.cpp | 2 +- src/core/thread/mle.hpp | 2 +- src/core/thread/network_data_leader_ftd.cpp | 2 +- src/core/thread/network_data_leader_ftd.hpp | 2 +- src/core/utils/channel_monitor.cpp | 2 +- src/core/utils/channel_monitor.hpp | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core/common/timer.cpp b/src/core/common/timer.cpp index 8e374771e..bcc758c18 100644 --- a/src/core/common/timer.cpp +++ b/src/core/common/timer.cpp @@ -44,7 +44,7 @@ namespace ot { const TimerScheduler::AlarmApi TimerMilliScheduler::sAlarmMilliApi = {&otPlatAlarmMilliStartAt, &otPlatAlarmMilliStop, &otPlatAlarmMilliGetNow}; -bool Timer::DoesFireBefore(const Timer &aSecondTimer, Time aNow) +bool Timer::DoesFireBefore(const Timer &aSecondTimer, Time aNow) const { bool retval; bool isBeforeNow = (GetFireTime() < aNow); diff --git a/src/core/common/timer.hpp b/src/core/common/timer.hpp index d60c5bd7e..563ee5379 100644 --- a/src/core/common/timer.hpp +++ b/src/core/common/timer.hpp @@ -132,7 +132,7 @@ protected: * @retval FALSE If the fire time of this timer object is the same or after aTimer's fire time. * */ - bool DoesFireBefore(const Timer &aSecondTimer, Time aNow); + bool DoesFireBefore(const Timer &aSecondTimer, Time aNow) const; void Fired(void) { mHandler(*this); } diff --git a/src/core/meshcop/joiner_router.hpp b/src/core/meshcop/joiner_router.hpp index 7ed5f6479..42b3fb1a7 100644 --- a/src/core/meshcop/joiner_router.hpp +++ b/src/core/meshcop/joiner_router.hpp @@ -89,7 +89,7 @@ private: struct JoinerEntrustMetadata { - otError AppendTo(Message &aMessage) { return aMessage.Append(*this); } + otError AppendTo(Message &aMessage) const { return aMessage.Append(*this); } void ReadFrom(const Message &aMessage); Ip6::MessageInfo mMessageInfo; // Message info of the message to send. diff --git a/src/core/net/ip6_mpl.hpp b/src/core/net/ip6_mpl.hpp index 9323d792b..07c1de459 100644 --- a/src/core/net/ip6_mpl.hpp +++ b/src/core/net/ip6_mpl.hpp @@ -106,7 +106,7 @@ public: * @returns The MPL Seed Id Length value. * */ - SeedIdLength GetSeedIdLength(void) { return static_cast(mControl & kSeedIdLengthMask); } + SeedIdLength GetSeedIdLength(void) const { return static_cast(mControl & kSeedIdLengthMask); } /** * This method sets the MPL Seed Id Length value. diff --git a/src/core/thread/csl_tx_scheduler.cpp b/src/core/thread/csl_tx_scheduler.cpp index c57108016..273932571 100644 --- a/src/core/thread/csl_tx_scheduler.cpp +++ b/src/core/thread/csl_tx_scheduler.cpp @@ -151,7 +151,7 @@ void CslTxScheduler::RescheduleCslTx(void) mCslTxChild = bestChild; } -uint32_t CslTxScheduler::GetNextCslTransmissionDelay(const Child &aChild, uint64_t aRadioNow) +uint32_t CslTxScheduler::GetNextCslTransmissionDelay(const Child &aChild, uint64_t aRadioNow) const { uint32_t delay; uint16_t period_offset = (aRadioNow / kUsPerTenSymbols) % aChild.GetCslPeriod(); diff --git a/src/core/thread/csl_tx_scheduler.hpp b/src/core/thread/csl_tx_scheduler.hpp index 50b99cb19..be48b4cae 100644 --- a/src/core/thread/csl_tx_scheduler.hpp +++ b/src/core/thread/csl_tx_scheduler.hpp @@ -190,7 +190,7 @@ private: void InitFrameRequestAhead(void); void RescheduleCslTx(void); - uint32_t GetNextCslTransmissionDelay(const Child &aChild, uint64_t aRadioNow); + uint32_t GetNextCslTransmissionDelay(const Child &aChild, uint64_t aRadioNow) const; // Callbacks from `Mac` otError HandleFrameRequest(Mac::TxFrame &aFrame); diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index 6c007c93d..7c9932c96 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -1011,7 +1011,7 @@ exit: return error; } -otError Mle::AppendSourceAddress(Message &aMessage) +otError Mle::AppendSourceAddress(Message &aMessage) const { return Tlv::AppendUint16Tlv(aMessage, Tlv::kSourceAddress, GetRloc16()); } diff --git a/src/core/thread/mle.hpp b/src/core/thread/mle.hpp index 6370aa0d2..508633b9a 100644 --- a/src/core/thread/mle.hpp +++ b/src/core/thread/mle.hpp @@ -935,7 +935,7 @@ protected: * @retval OT_ERROR_NO_BUFS Insufficient buffers available to append the Source Address TLV. * */ - otError AppendSourceAddress(Message &aMessage); + otError AppendSourceAddress(Message &aMessage) const; /** * This method appends a Mode TLV to a message. diff --git a/src/core/thread/network_data_leader_ftd.cpp b/src/core/thread/network_data_leader_ftd.cpp index 3e4958d34..a73d1f721 100644 --- a/src/core/thread/network_data_leader_ftd.cpp +++ b/src/core/thread/network_data_leader_ftd.cpp @@ -963,7 +963,7 @@ exit: return error; } -otError Leader::AllocateServiceId(uint8_t &aServiceId) +otError Leader::AllocateServiceId(uint8_t &aServiceId) const { otError error = OT_ERROR_NOT_FOUND; uint8_t serviceId; diff --git a/src/core/thread/network_data_leader_ftd.hpp b/src/core/thread/network_data_leader_ftd.hpp index f76486dbf..98be24545 100644 --- a/src/core/thread/network_data_leader_ftd.hpp +++ b/src/core/thread/network_data_leader_ftd.hpp @@ -215,7 +215,7 @@ private: otError AddService(const ServiceTlv &aService, ChangedFlags &aChangedFlags); otError AddServer(const ServerTlv &aServer, ServiceTlv &aDstService, ChangedFlags &aChangedFlags); - otError AllocateServiceId(uint8_t &aServiceId); + otError AllocateServiceId(uint8_t &aServiceId) const; otError AllocateContextId(uint8_t &aConextId); void FreeContextId(uint8_t aContextId); diff --git a/src/core/utils/channel_monitor.cpp b/src/core/utils/channel_monitor.cpp index 1ce50a87d..5c5ba274c 100644 --- a/src/core/utils/channel_monitor.cpp +++ b/src/core/utils/channel_monitor.cpp @@ -202,7 +202,7 @@ void ChannelMonitor::LogResults(void) #endif } -Mac::ChannelMask ChannelMonitor::FindBestChannels(const Mac::ChannelMask &aMask, uint16_t &aOccupancy) +Mac::ChannelMask ChannelMonitor::FindBestChannels(const Mac::ChannelMask &aMask, uint16_t &aOccupancy) const { uint8_t channel; Mac::ChannelMask bestMask; diff --git a/src/core/utils/channel_monitor.hpp b/src/core/utils/channel_monitor.hpp index 26899beb2..076ae55ed 100644 --- a/src/core/utils/channel_monitor.hpp +++ b/src/core/utils/channel_monitor.hpp @@ -183,7 +183,7 @@ public: * channel with the same occupancy rate value. * */ - Mac::ChannelMask FindBestChannels(const Mac::ChannelMask &aMask, uint16_t &aOccupancy); + Mac::ChannelMask FindBestChannels(const Mac::ChannelMask &aMask, uint16_t &aOccupancy) const; private: enum