commit 90173ad9663b47558036789fa9fb16cb3af88b8b
author Ashlesh Gawande <agawande@memphis.edu> Wed Aug 09 15:19:50 2017 -0500
committer Ashlesh Gawande <agawande@memphis.edu> Mon Aug 14 10:54:15 2017 -0500
tree 36c7f3efa93926ee98a25114a279b1972b07e96e
parent 608061b95d10c6745a38f654398772761b1240f6

Resolve ASan errors that will be thrown once it is turned on

Plus few minor spelling and code-style issues

refs: #4230

Change-Id: Ia665bab546a9628347af45836dcbe765dc91c54f

src/lsdb.cpp

diff --git a/src/lsdb.cpp b/src/lsdb.cpp
index 9173b89..99cd285 100644
--- a/src/lsdb.cpp
+++ b/src/lsdb.cpp
@@ -196,7 +196,7 @@
                                 const ndn::time::seconds& expTime)
 {
   return m_scheduler.scheduleEvent(expTime + GRACE_PERIOD,
-                                   std::bind(&Lsdb::exprireOrRefreshNameLsa, this, key, seqNo));
+                                   std::bind(&Lsdb::expireOrRefreshNameLsa, this, key, seqNo));
 }
 
 bool
@@ -438,7 +438,7 @@
                                       const ndn::time::seconds& expTime)
 {
   return m_scheduler.scheduleEvent(expTime + GRACE_PERIOD,
-                                   std::bind(&Lsdb::exprireOrRefreshCoordinateLsa,
+                                   std::bind(&Lsdb::expireOrRefreshCoordinateLsa,
                                              this, key, seqNo));
 }
 
@@ -696,7 +696,7 @@
                                const ndn::time::seconds& expTime)
 {
   return m_scheduler.scheduleEvent(expTime + GRACE_PERIOD,
-                                   std::bind(&Lsdb::exprireOrRefreshAdjLsa, this, key, seqNo));
+                                   std::bind(&Lsdb::expireOrRefreshAdjLsa, this, key, seqNo));
 }
 
 bool
@@ -826,9 +826,9 @@
   // lsaKey is the key of the LSA's publishing router.
   // seqNo is the seq. no. of the candidate LSA.
 void
-Lsdb::exprireOrRefreshNameLsa(const ndn::Name& lsaKey, uint64_t seqNo)
+Lsdb::expireOrRefreshNameLsa(const ndn::Name& lsaKey, uint64_t seqNo)
 {
-  _LOG_DEBUG("Lsdb::exprireOrRefreshNameLsa Called");
+  _LOG_DEBUG("Lsdb::expireOrRefreshNameLsa Called");
   _LOG_DEBUG("LSA Key : " << lsaKey << " Seq No: " << seqNo);
   NameLsa* chkNameLsa = findNameLsa(lsaKey);
   // If this name LSA exists in the LSDB
@@ -869,9 +869,9 @@
   // lsaKey is the key of the LSA's publishing router.
   // seqNo is the seq. no. of the candidate LSA.
 void
-Lsdb::exprireOrRefreshAdjLsa(const ndn::Name& lsaKey, uint64_t seqNo)
+Lsdb::expireOrRefreshAdjLsa(const ndn::Name& lsaKey, uint64_t seqNo)
 {
-  _LOG_DEBUG("Lsdb::exprireOrRefreshAdjLsa Called");
+  _LOG_DEBUG("Lsdb::expireOrRefreshAdjLsa Called");
   _LOG_DEBUG("LSA Key: " << lsaKey << " Seq No: " << seqNo);
   AdjLsa* chkAdjLsa = findAdjLsa(lsaKey);
   // If this is a valid LSA
@@ -916,10 +916,10 @@
   // lsaKey is the key of the LSA's publishing router.
   // seqNo is the seq. no. of the candidate LSA.
 void
-Lsdb::exprireOrRefreshCoordinateLsa(const ndn::Name& lsaKey,
+Lsdb::expireOrRefreshCoordinateLsa(const ndn::Name& lsaKey,
                                     uint64_t seqNo)
 {
-  _LOG_DEBUG("Lsdb::exprireOrRefreshCorLsa Called ");
+  _LOG_DEBUG("Lsdb::expireOrRefreshCorLsa Called ");
   _LOG_DEBUG("LSA Key : " << lsaKey << " Seq No: " << seqNo);
   CoordinateLsa* chkCorLsa = findCoordinateLsa(lsaKey);
   // Whether the LSA is in the LSDB or not.