espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-25 02:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[code-style] fix initializers in constructors

Browse Source
This commit is contained in:
Jonathan Hui
2018-02-09 21:43:42 +00:00
parent 69d98d4a53
commit 12237d07dc
8 changed files with 49 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/cli.cpp
+9 -16
View File
@@ -261,33 +261,26 @@ typedef otPtr<const uint8_t> otBufferPtr;
typedef otPtr<const char> otStringPtr;
Interpreter::Interpreter(Instance *aInstance)
:
#if OPENTHREAD_ENABLE_APPLICATION_COAP
mCoap(*this)
,
#endif
mUserCommands(NULL)
: mUserCommands(NULL)
, mUserCommandsLength(0)
, mServer(NULL)
,
#ifdef OTDLL
mApiInstance(otApiInit())
, mApiInstance(otApiInit())
, mInstanceIndex(0)
,
#else
mLength(8)
, mLength(8)
, mCount(1)
, mInterval(1000)
, mPingTimer(*aInstance, &Interpreter::s_HandlePingTimer, this)
,
#if OPENTHREAD_ENABLE_DNS_CLIENT
mResolvingInProgress(0)
,
, mResolvingInProgress(0)
#endif
mUdp(*this)
,
, mUdp(*this)
#endif
, mInstance(aInstance)
#if OPENTHREAD_ENABLE_APPLICATION_COAP
, mCoap(*this)
#endif
mInstance(aInstance)
{
#ifdef OTDLL
assert(mApiInstance);
src/cli/cli.hpp
+6 -6
View File
@@ -379,12 +379,6 @@ private:
static Interpreter &GetOwner(OwnerLocator &aOwnerLocator);
#if OPENTHREAD_ENABLE_APPLICATION_COAP
Coap mCoap;
#endif // OPENTHREAD_ENABLE_APPLICATION_COAP
static const struct Command sCommands[];
const otCliCommand * mUserCommands;
uint8_t mUserCommandsLength;
@@ -431,6 +425,12 @@ private:
#endif
Instance *mInstance;
#if OPENTHREAD_ENABLE_APPLICATION_COAP
Coap mCoap;
#endif // OPENTHREAD_ENABLE_APPLICATION_COAP
};
} // namespace Cli
src/core/common/instance.cpp
+8 -16
View File
@@ -57,35 +57,27 @@ Instance::Instance(void)
, mEnergyScanCallbackContext(NULL)
, mNotifier(*this)
, mTimerMilliScheduler(*this)
,
#if OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER
mTimerMicroScheduler(*this)
,
, mTimerMicroScheduler(*this)
#endif
mIp6(*this)
, mIp6(*this)
, mThreadNetif(*this)
,
#if OPENTHREAD_ENABLE_RAW_LINK_API
mLinkRaw(*this)
,
, mLinkRaw(*this)
#endif
#if OPENTHREAD_ENABLE_APPLICATION_COAP
mApplicationCoap(*this)
,
, mApplicationCoap(*this)
#endif
#if OPENTHREAD_CONFIG_ENABLE_DYNAMIC_LOG_LEVEL
mLogLevel(static_cast<otLogLevel>(OPENTHREAD_CONFIG_LOG_LEVEL))
,
, mLogLevel(static_cast<otLogLevel>(OPENTHREAD_CONFIG_LOG_LEVEL))
#endif
#if OPENTHREAD_ENABLE_CHANNEL_MONITOR
mChannelMonitor(*this)
,
, mChannelMonitor(*this)
#endif
#if OPENTHREAD_ENABLE_CHANNEL_MANAGER
mChannelManager(*this)
,
, mChannelManager(*this)
#endif
mMessagePool(*this)
, mMessagePool(*this)
, mIsInitialized(false)
{
}
src/core/common/trickle_timer.cpp
+2 -4
View File
@@ -48,13 +48,11 @@ TrickleTimer::TrickleTimer(Instance &aInstance,
Handler aIntervalExpiredHandler,
void * aOwner)
: TimerMilli(aInstance, HandleTimerFired, aOwner)
,
#ifdef ENABLE_TRICKLE_TIMER_SUPPRESSION_SUPPORT
k(aRedundancyConstant)
, k(aRedundancyConstant)
, c(0)
,
#endif
Imin(0)
, Imin(0)
, Imax(0)
, mMode(kModeNormal)
, I(0)
src/core/mac/mac.cpp
+4 -8
View File
@@ -84,12 +84,10 @@ Mac::Mac(Instance &aInstance)
, mPendingWaitingForData(false)
, mRxOnWhenIdle(false)
, mBeaconsEnabled(false)
,
#if OPENTHREAD_CONFIG_STAY_AWAKE_BETWEEN_FRAGMENTS
mDelaySleep(false)
,
, mDelaySleep(false)
#endif
mOperationTask(aInstance, &Mac::PerformOperation, this)
, mOperationTask(aInstance, &Mac::PerformOperation, this)
, mMacTimer(aInstance, &Mac::HandleMacTimer, this)
, mBackoffTimer(aInstance, &Mac::HandleBackoffTimer, this)
, mReceiveTimer(aInstance, &Mac::HandleReceiveTimer, this)
@@ -113,12 +111,10 @@ Mac::Mac(Instance &aInstance)
, // Initialize `mActiveScanHandler` and `mEnergyScanHandler` union
mPcapCallback(NULL)
, mPcapCallbackContext(NULL)
,
#if OPENTHREAD_ENABLE_MAC_FILTER
mFilter()
,
, mFilter()
#endif // OPENTHREAD_ENABLE_MAC_FILTER
mTxFrame(static_cast<Frame *>(otPlatRadioGetTransmitBuffer(&aInstance)))
, mTxFrame(static_cast<Frame *>(otPlatRadioGetTransmitBuffer(&aInstance)))
, mOobFrame(NULL)
, mKeyIdMode2FrameCounter(0)
, mCcaSuccessRateTracker()
src/core/thread/mesh_forwarder.cpp
+2 -4
View File
@@ -78,16 +78,14 @@ MeshForwarder::MeshForwarder(Instance &aInstance)
, mRestoreChannel(0)
, mRestorePanId(Mac::kPanIdBroadcast)
, mScanning(false)
,
#if OPENTHREAD_FTD
mSourceMatchController(aInstance)
, mSourceMatchController(aInstance)
, mSendMessageFrameCounter(0)
, mSendMessageKeyId(0)
, mSendMessageDataSequenceNumber(0)
, mStartChildIndex(0)
,
#endif
mDataPollManager(aInstance)
, mDataPollManager(aInstance)
{
mFragTag = static_cast<uint16_t>(otPlatRandomGet());
GetNetif().GetMac().RegisterReceiver(mMacReceiver);
src/core/thread/mle.cpp
+3 -6
View File
@@ -92,20 +92,17 @@ Mle::Mle(Instance &aInstance)
, mDiscoverContext(NULL)
, mIsDiscoverInProgress(false)
, mEnableEui64Filtering(false)
,
#if OPENTHREAD_CONFIG_INFORM_PREVIOUS_PARENT_ON_REATTACH
mPreviousParentRloc(Mac::kShortAddrInvalid)
,
, mPreviousParentRloc(Mac::kShortAddrInvalid)
#endif
#if OPENTHREAD_CONFIG_ENABLE_PERIODIC_PARENT_SEARCH
mParentSearchIsInBackoff(false)
, mParentSearchIsInBackoff(false)
, mParentSearchBackoffWasCanceled(false)
, mParentSearchRecentlyDetached(false)
, mParentSearchBackoffCancelTime(0)
, mParentSearchTimer(aInstance, &Mle::HandleParentSearchTimer, this)
,
#endif
mAnnounceChannel(OT_RADIO_CHANNEL_MIN)
, mAnnounceChannel(OT_RADIO_CHANNEL_MIN)
, mPreviousChannel(0)
, mPreviousPanId(Mac::kPanIdBroadcast)
, mNotifierCallback(&Mle::HandleStateChanged, this)
src/core/thread/thread_netif.cpp
+15 -30
View File
@@ -71,67 +71,52 @@ static const otMasterKey kThreadMasterKey = {{
ThreadNetif::ThreadNetif(Instance &aInstance)
: Netif(aInstance, OT_NETIF_INTERFACE_ID_THREAD)
, mCoap(aInstance)
,
#if OPENTHREAD_ENABLE_DHCP6_CLIENT
mDhcp6Client(aInstance)
,
, mDhcp6Client(aInstance)
#endif // OPENTHREAD_ENABLE_DHCP6_CLIENT
#if OPENTHREAD_ENABLE_DHCP6_SERVER
mDhcp6Server(aInstance)
,
, mDhcp6Server(aInstance)
#endif // OPENTHREAD_ENABLE_DHCP6_SERVER
#if OPENTHREAD_ENABLE_DNS_CLIENT
mDnsClient(aInstance.GetThreadNetif())
,
, mDnsClient(aInstance.GetThreadNetif())
#endif // OPENTHREAD_ENABLE_DNS_CLIENT
mActiveDataset(aInstance)
, mActiveDataset(aInstance)
, mPendingDataset(aInstance)
, mKeyManager(aInstance)
, mLowpan(aInstance)
, mMac(aInstance)
, mMeshForwarder(aInstance)
, mMleRouter(aInstance)
,
#if OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE
mNetworkDataLocal(aInstance)
,
, mNetworkDataLocal(aInstance)
#endif
mNetworkDataLeader(aInstance)
,
, mNetworkDataLeader(aInstance)
#if OPENTHREAD_FTD || OPENTHREAD_ENABLE_MTD_NETWORK_DIAGNOSTIC
mNetworkDiagnostic(aInstance)
,
, mNetworkDiagnostic(aInstance)
#endif
mIsUp(false)
,
, mIsUp(false)
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
mCommissioner(aInstance)
,
, mCommissioner(aInstance)
#endif // OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_ENABLE_DTLS
mDtls(aInstance)
, mDtls(aInstance)
, mCoapSecure(aInstance)
,
#endif
#if OPENTHREAD_ENABLE_JOINER
mJoiner(aInstance)
,
, mJoiner(aInstance)
#endif // OPENTHREAD_ENABLE_JOINER
#if OPENTHREAD_ENABLE_JAM_DETECTION
mJamDetector(aInstance)
,
, mJamDetector(aInstance)
#endif // OPENTHREAD_ENABLE_JAM_DETECTTION
#if OPENTHREAD_FTD
#if OPENTHREAD_ENABLE_TMF_PROXY
mTmfProxy(mMleRouter.GetMeshLocal16(), mCoap)
,
, mTmfProxy(mMleRouter.GetMeshLocal16(), mCoap)
#endif // OPENTHREAD_ENABLE_TMF_PROXY
mJoinerRouter(aInstance)
, mJoinerRouter(aInstance)
, mLeader(aInstance)
, mAddressResolver(aInstance)
,
#endif // OPENTHREAD_FTD
mChildSupervisor(aInstance)
, mChildSupervisor(aInstance)
, mSupervisionListener(aInstance)
, mAnnounceBegin(aInstance)
, mPanIdQuery(aInstance)