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.hpp

diff --git a/src/lsdb.hpp b/src/lsdb.hpp
index 1ac25f2..2b182bd 100644
--- a/src/lsdb.hpp
+++ b/src/lsdb.hpp
@@ -22,18 +22,18 @@
 #ifndef NLSR_LSDB_HPP
 #define NLSR_LSDB_HPP
 
-#include <utility>
-#include <boost/cstdint.hpp>
-
-#include <ndn-cxx/security/key-chain.hpp>
-#include <ndn-cxx/util/time.hpp>
-
 #include "conf-parameter.hpp"
 #include "lsa.hpp"
 #include "sequencing-manager.hpp"
 #include "test-access-control.hpp"
 #include "communication/sync-logic-handler.hpp"
 
+#include <utility>
+#include <boost/cstdint.hpp>
+
+#include <ndn-cxx/security/key-chain.hpp>
+#include <ndn-cxx/util/time.hpp>
+
 namespace nlsr {
 
 using namespace ndn::time;
@@ -271,7 +271,7 @@
     \param seqNo The seq. no. of the LSA to check.
   */
   void
-  exprireOrRefreshNameLsa(const ndn::Name& lsaKey, uint64_t seqNo);
+  expireOrRefreshNameLsa(const ndn::Name& lsaKey, uint64_t seqNo);
 
 PUBLIC_WITH_TESTS_ELSE_PRIVATE:
   /*! \brief Schedules an expire/refresh event in the LSA.
@@ -286,14 +286,14 @@
 private:
 
   void
-  exprireOrRefreshAdjLsa(const ndn::Name& lsaKey, uint64_t seqNo);
+  expireOrRefreshAdjLsa(const ndn::Name& lsaKey, uint64_t seqNo);
 
   ndn::EventId
   scheduleCoordinateLsaExpiration(const ndn::Name& key, int seqNo,
                                   const seconds& expTime);
 
   void
-  exprireOrRefreshCoordinateLsa(const ndn::Name& lsaKey,
+  expireOrRefreshCoordinateLsa(const ndn::Name& lsaKey,
                                 uint64_t seqNo);
 
 private: