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/publisher/lsdb-dataset-interest-handler.cpp

diff --git a/src/publisher/lsdb-dataset-interest-handler.cpp b/src/publisher/lsdb-dataset-interest-handler.cpp
index e3cfa1f..acd5c92 100644
--- a/src/publisher/lsdb-dataset-interest-handler.cpp
+++ b/src/publisher/lsdb-dataset-interest-handler.cpp
@@ -27,24 +27,22 @@
  */
 
 #include "lsdb-dataset-interest-handler.hpp"
-
 #include "logger.hpp"
 #include "nlsr.hpp"
+#include "tlv/lsdb-status.hpp"
 
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/mgmt/nfd/control-response.hpp>
 #include <ndn-cxx/util/regex.hpp>
-#include "tlv/lsdb-status.hpp"
 
 namespace nlsr {
 
 INIT_LOGGER("LsdbDatasetInterestHandler");
+
 const ndn::PartialName ADJACENCIES_DATASET = ndn::PartialName("lsdb/adjacencies");
 const ndn::PartialName COORDINATES_DATASET = ndn::PartialName("lsdb/coordinates");
 const ndn::PartialName NAMES_DATASET = ndn::PartialName("lsdb/names");
 const ndn::PartialName LISTS_DATASET = ndn::PartialName("lsdb/list");
-const ndn::PartialName LsdbDatasetInterestHandler::LOCALHOST_COMMAND_PREFIX =
-      ndn::Name(Nlsr::LOCALHOST_PREFIX).append(Lsdb::NAME_COMPONENT);
 
 LsdbDatasetInterestHandler::LsdbDatasetInterestHandler(Lsdb& lsdb,
                                                        ndn::mgmt::Dispatcher& localHostDispatcher,

src/publisher/lsdb-dataset-interest-handler.hpp

diff --git a/src/publisher/lsdb-dataset-interest-handler.hpp b/src/publisher/lsdb-dataset-interest-handler.hpp
index f16075f..f8aa025 100644
--- a/src/publisher/lsdb-dataset-interest-handler.hpp
+++ b/src/publisher/lsdb-dataset-interest-handler.hpp
@@ -23,13 +23,13 @@
 #define NLSR_PUBLISHER_LSDB_DATASET_INTEREST_HANDLER_HPP
 
 #include "lsa-publisher.hpp"
+#include "tlv/adjacency-lsa.hpp"
+#include "tlv/coordinate-lsa.hpp"
+#include "tlv/name-lsa.hpp"
 
 #include <ndn-cxx/mgmt/dispatcher.hpp>
 #include <ndn-cxx/face.hpp>
 #include <boost/noncopyable.hpp>
-#include "tlv/adjacency-lsa.hpp"
-#include "tlv/coordinate-lsa.hpp"
-#include "tlv/name-lsa.hpp"
 
 namespace nlsr {
 
@@ -56,12 +56,6 @@
                              ndn::Face& face,
                              ndn::KeyChain& keyChain);
 
-  const ndn::Name&
-  getLocalhostCommandPrefix()
-  {
-    return LOCALHOST_COMMAND_PREFIX;
-  }
-
   ndn::Name&
   getRouterNameCommandPrefix()
   {
@@ -105,7 +99,6 @@
                    ndn::mgmt::StatusDatasetContext& context);
 
 private:
-  static const ndn::Name LOCALHOST_COMMAND_PREFIX;
   ndn::Name m_routerNamePrefix;
 
   ndn::mgmt::Dispatcher& m_localhostDispatcher;