From 4e1a3bf6701f464d67aaf4e50390c0e2bf6f4527 Mon Sep 17 00:00:00 2001
From: Abtin Keshavarzian <abtink@google.com>
Date: Mon, 22 Jun 2020 11:23:20 -0700
Subject: [PATCH] [tasklet] use function reference (instead of pointer) for
 tasklet handler (#5136)

---
 src/core/coap/coap_secure.cpp      | 2 +-
 src/core/common/notifier.cpp       | 2 +-
 src/core/common/tasklet.hpp        | 4 ++--
 src/core/mac/mac.cpp               | 2 +-
 src/core/net/ip6.cpp               | 2 +-
 src/core/thread/mesh_forwarder.cpp | 2 +-
 src/ncp/ncp_base.cpp               | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core/coap/coap_secure.cpp b/src/core/coap/coap_secure.cpp
index 33f0fbe65..9a4f79c41 100644
--- a/src/core/coap/coap_secure.cpp
+++ b/src/core/coap/coap_secure.cpp
@@ -51,7 +51,7 @@ CoapSecure::CoapSecure(Instance &aInstance, bool aLayerTwoSecurity)
     , mConnectedCallback(nullptr)
     , mConnectedContext(nullptr)
     , mTransmitQueue()
-    , mTransmitTask(aInstance, &CoapSecure::HandleTransmit, this)
+    , mTransmitTask(aInstance, CoapSecure::HandleTransmit, this)
 {
 }
 
diff --git a/src/core/common/notifier.cpp b/src/core/common/notifier.cpp
index d8463addd..12f6c1cdf 100644
--- a/src/core/common/notifier.cpp
+++ b/src/core/common/notifier.cpp
@@ -51,7 +51,7 @@ Notifier::Notifier(Instance &aInstance)
     : InstanceLocator(aInstance)
     , mEventsToSignal()
     , mSignaledEvents()
-    , mTask(aInstance, &Notifier::EmitEvents, this)
+    , mTask(aInstance, Notifier::EmitEvents, this)
     , mReceivers()
 {
     for (unsigned int i = 0; i < kMaxExternalHandlers; i++)
diff --git a/src/core/common/tasklet.hpp b/src/core/common/tasklet.hpp
index ade2722ab..198858c6f 100644
--- a/src/core/common/tasklet.hpp
+++ b/src/core/common/tasklet.hpp
@@ -67,12 +67,12 @@ class Tasklet : public InstanceLocator, public OwnerLocator
 
 public:
     /**
-     * This function pointer is called when the tasklet is run.
+     * This function reference is called when the tasklet is run.
      *
      * @param[in]  aTasklet  A reference to the tasklet being run.
      *
      */
-    typedef void (*Handler)(Tasklet &aTasklet);
+    typedef void (&Handler)(Tasklet &aTasklet);
 
     /**
      * This constructor creates a tasklet instance.
diff --git a/src/core/mac/mac.cpp b/src/core/mac/mac.cpp
index 7f4c659dc..30a77d5b4 100644
--- a/src/core/mac/mac.cpp
+++ b/src/core/mac/mac.cpp
@@ -115,7 +115,7 @@ Mac::Mac(Instance &aInstance)
     , mActiveScanHandler(nullptr) // Initialize `mActiveScanHandler` and `mEnergyScanHandler` union
     , mScanHandlerContext(nullptr)
     , mSubMac(aInstance)
-    , mOperationTask(aInstance, &Mac::HandleOperationTask, this)
+    , mOperationTask(aInstance, Mac::HandleOperationTask, this)
     , mTimer(aInstance, Mac::HandleTimer, this)
     , mOobFrame(nullptr)
     , mKeyIdMode2FrameCounter(0)
diff --git a/src/core/net/ip6.cpp b/src/core/net/ip6.cpp
index e7774fd44..11b178ed7 100644
--- a/src/core/net/ip6.cpp
+++ b/src/core/net/ip6.cpp
@@ -57,7 +57,7 @@ Ip6::Ip6(Instance &aInstance)
     , mReceiveIp6DatagramCallback(nullptr)
     , mReceiveIp6DatagramCallbackContext(nullptr)
     , mSendQueue()
-    , mSendQueueTask(aInstance, HandleSendQueue, this)
+    , mSendQueueTask(aInstance, Ip6::HandleSendQueue, this)
     , mIcmp(aInstance)
     , mUdp(aInstance)
     , mMpl(aInstance)
diff --git a/src/core/thread/mesh_forwarder.cpp b/src/core/thread/mesh_forwarder.cpp
index 41ebe074c..35743e3e0 100644
--- a/src/core/thread/mesh_forwarder.cpp
+++ b/src/core/thread/mesh_forwarder.cpp
@@ -66,7 +66,7 @@ MeshForwarder::MeshForwarder(Instance &aInstance)
     , mEnabled(false)
     , mTxPaused(false)
     , mSendBusy(false)
-    , mScheduleTransmissionTask(aInstance, ScheduleTransmissionTask, this)
+    , mScheduleTransmissionTask(aInstance, MeshForwarder::ScheduleTransmissionTask, this)
 #if OPENTHREAD_FTD
     , mIndirectSender(aInstance)
 #endif
diff --git a/src/ncp/ncp_base.cpp b/src/ncp/ncp_base.cpp
index 04bcb3791..084be960f 100644
--- a/src/ncp/ncp_base.cpp
+++ b/src/ncp/ncp_base.cpp
@@ -205,7 +205,7 @@ NcpBase::NcpBase(Instance *aInstance)
     , mDiscoveryScanJoinerFlag(false)
     , mDiscoveryScanEnableFiltering(false)
     , mDiscoveryScanPanId(0xffff)
-    , mUpdateChangedPropsTask(*aInstance, &NcpBase::UpdateChangedProps, this)
+    , mUpdateChangedPropsTask(*aInstance, NcpBase::UpdateChangedProps, this)
     , mThreadChangedFlags(0)
     , mChangedPropsSet()
     , mHostPowerState(SPINEL_HOST_POWER_STATE_ONLINE)